fixed search

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

@@ -158,26 +158,13 @@ public class EsDenseVectorService {
         SearchResponse<PatentVector> response = client.search(builder.build(), PatentVector.class);
         List<Hit<PatentVector>> hits = response.hits().hits();
         List<EsPatentVectorVo> vectorVos = new ArrayList<>();
-        Double fixedScore = 1.7d;
         for (Hit<PatentVector> hit : hits) {
-            if (!CollectionUtils.isEmpty(imageList)) {
-                Double score = hit.score();
-                if (score > fixedScore) {
-                    PatentVector vector = hit.source();
-                    EsPatentVectorVo vectorVo = new EsPatentVectorVo();
-                    BeanUtil.copy(vector, vectorVo);
-                    PatentColumnDTO columnDTO = esPatentService.selectPatentByAppNo(vector.getAppNo());
-                    vectorVo.setPatentNo(columnDTO.getPatentNo());
-                    vectorVos.add(vectorVo);
-                }
-            } else {
-                PatentVector vector = hit.source();
-                EsPatentVectorVo vectorVo = new EsPatentVectorVo();
-                BeanUtil.copy(vector, vectorVo);
-                PatentColumnDTO columnDTO = esPatentService.selectPatentByAppNo(vector.getAppNo());
-                vectorVo.setPatentNo(columnDTO.getPatentNo());
-                vectorVos.add(vectorVo);
-            }
+            PatentVector vector = hit.source();
+            EsPatentVectorVo vectorVo = new EsPatentVectorVo();
+            BeanUtil.copy(vector, vectorVo);
+            PatentColumnDTO columnDTO = esPatentService.selectPatentByAppNo(vector.getAppNo());
+            vectorVo.setPatentNo(columnDTO.getPatentNo());
+            vectorVos.add(vectorVo);
         }
 
         Aggregate aggregate = response.aggregations().get("count");
@@ -186,8 +173,7 @@ public class EsDenseVectorService {
         records.setCurrent(pageNum);
         records.setSize(pageSize);
         records.setData(vectorVos);
-        long count = total >= vectorVos.size() ? total : vectorVos.size();
-        records.setTotal(count);
+        records.setTotal(total);
 
         if (Boolean.TRUE.equals(ifAddSearchRecord)) {
             //添加检索历史
@@ -203,7 +189,7 @@ public class EsDenseVectorService {
             if (!CollectionUtils.isEmpty(getGuids)) {
                 recordDTO.setGuid(getGuids.get(0));
             }
-            recordDTO.setAllNum(Integer.parseInt(String.valueOf(count)));
+            recordDTO.setAllNum(Integer.parseInt(String.valueOf(total)));
             recordDTO.setSearchTime(new Date());
             searchRecordService.addSearchRecord(recordDTO);
         }

src/main/resources/application-dev.yml

@@ -66,7 +66,7 @@ PCSUrl: http://localhost:8871
 #OPSUrl: http://192.168.1.24:5001
 OPSUrl: http://139.224.24.90:5001
 PASUrl: http://localhost:8877
-FMSUrl: http://localhost:8802
+FMSUrl: http://localhost:8801
 VectorUrl: http://139.224.24.90:8000
 FileSource: 5