fixed essearch

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsDenseVectorService.java

@@ -17,6 +17,7 @@ import com.example.xiaoshiweixinback.business.common.base.Records;
 import com.example.xiaoshiweixinback.business.common.base.RedisConf;
 import com.example.xiaoshiweixinback.business.redis.RedisService;
 import com.example.xiaoshiweixinback.business.utils.BeanUtil;
+import com.example.xiaoshiweixinback.business.utils.JSONUtil;
 import com.example.xiaoshiweixinback.business.utils.RegexUtil;
 import com.example.xiaoshiweixinback.business.utils.parseQueryToTree.expressManager;
 import com.example.xiaoshiweixinback.business.utils.parseQueryToTree.operateNode;
@@ -28,6 +29,7 @@ import com.example.xiaoshiweixinback.entity.dto.esPicture.EsPictureNoDTO;
 import com.example.xiaoshiweixinback.entity.dto.esPicture.EsPatentVectorDTO;
 import com.example.xiaoshiweixinback.entity.dto.patent.PatentColumnDTO;
 import com.example.xiaoshiweixinback.entity.dto.searchRecord.AddSearchRecordDTO;
+import com.example.xiaoshiweixinback.entity.dto.searchRecord.SearchRecordConditionDTO;
 import com.example.xiaoshiweixinback.entity.vo.esPicture.EsPictureNoVo;
 import com.example.xiaoshiweixinback.entity.vo.esPicture.EsPatentVectorVo;
 import com.example.xiaoshiweixinback.mapper.ProductMapper;
@@ -178,13 +180,11 @@ public class EsDenseVectorService {
         if (Boolean.TRUE.equals(ifAddSearchRecord)) {
             //添加检索历史
             AddSearchRecordDTO recordDTO = new AddSearchRecordDTO();
-            if (dto.getProductId() != null) {
-                recordDTO.setProductId(dto.getProductId());
-                Product product = productMapper.selectById(dto.getProductId());
-                recordDTO.setSearchCondition(product.getName());
-            } else {
-                recordDTO.setSearchCondition(dto.getKey());
-            }
+            SearchRecordConditionDTO conditionDTO = new SearchRecordConditionDTO();
+            conditionDTO.setKey(dto.getKey());
+            conditionDTO.setCompanyName(dto.getCompanyName());
+            conditionDTO.setAppCountry(dto.getAppCountry());
+            recordDTO.setSearchCondition(JSONUtil.toJSONString(conditionDTO));
             recordDTO.setDescription(dto.getDescription());
             if (!CollectionUtils.isEmpty(getGuids)) {
                 recordDTO.setGuid(getGuids.get(0));
@@ -253,10 +253,11 @@ public class EsDenseVectorService {
             searchCondition = searchCondition + " AND " + "AD = " + "(" + s + ")";
         }
         if (StringUtils.isNotEmpty(appCountry)) {
+            String s = this.appendStr(appCountry);
             if (StringUtils.isEmpty(searchCondition)) {
-                searchCondition = "CO = " + "(" + appCountry + ")";
+                searchCondition = "CO = " + "(" + s + ")";
             } else {
-                searchCondition = searchCondition + " AND " + "CO = " + "(" + appCountry + ")";
+                searchCondition = searchCondition + " AND " + "CO = " + "(" + s + ")";
             }
         }
         if (StringUtils.isNotEmpty(companyName)) {