zero пре 1 година
родитељ
комит
d5b01d4e37

+ 2 - 0
src/main/java/com/example/xiaoshiweixinback/service/ProductService.java

@@ -1,5 +1,6 @@
 package com.example.xiaoshiweixinback.service;
 
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -7,6 +8,7 @@ import com.example.xiaoshiweixinback.business.common.base.Records;
 import com.example.xiaoshiweixinback.business.common.base.SystemFile;
 import com.example.xiaoshiweixinback.business.utils.CacheUtil;
 import com.example.xiaoshiweixinback.business.utils.LoginUtils;
+import com.example.xiaoshiweixinback.business.utils.ToolUtil;
 import com.example.xiaoshiweixinback.domain.AssoPersonProduct;
 import com.example.xiaoshiweixinback.domain.AssoProductFile;
 import com.example.xiaoshiweixinback.domain.Product;

+ 10 - 3
src/main/java/com/example/xiaoshiweixinback/service/common/EsDenseVectorService.java

@@ -155,10 +155,17 @@ public class EsDenseVectorService {
 
         //添加检索历史
         AddSearchRecordDTO recordDTO = new AddSearchRecordDTO();
-        recordDTO.setProductId(dto.getProductId());
+        if (dto.getProductId() != null) {
+            recordDTO.setProductId(dto.getProductId());
+            Product product = productMapper.selectById(dto.getProductId());
+            recordDTO.setSearchCondition(product.getName());
+        } else {
+            recordDTO.setSearchCondition(dto.getKey());
+        }
         recordDTO.setDescription(dto.getDescription());
-        recordDTO.setGuid(file.getPath());
-        recordDTO.setSearchCondition(condition);
+        if (file != null && file.length() != 0) {
+            recordDTO.setGuid(file.getPath());
+        }
         recordDTO.setAllNum(Integer.parseInt(String.valueOf(count)));
         recordDTO.setSearchTime(new Date());
         searchRecordService.addSearchRecord(recordDTO);