zero 1 ano atrás
pai
commit
4572e4d6ea

+ 2 - 2
src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/MatchPhasePrefixQueryBuilder.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Component;
 import java.text.ParseException;
 
 @Component
-public class MatchPhasePrefixQueryBuilder implements IQueryBuilder{
+public class PrefixQueryBuilder implements IQueryBuilder{
     private String field = "";
     private String value = "";
     private String operator = "";
@@ -15,7 +15,7 @@ public class MatchPhasePrefixQueryBuilder implements IQueryBuilder{
 
     @Override
     public Query creteQuery() throws ParseException {
-        return QueryBuilders.matchPhrasePrefix(i -> i.field(field).query(value));
+        return QueryBuilders.prefix(i -> i.field(field).value(value));
     }
 
     public String getField() {

+ 10 - 4
src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -321,7 +321,10 @@ public class EsService {
     public EsPatentFamilyDTO selectEsPatentFamily(List<String> nos, String type) throws IOException {
         EsPatentFamilyDTO esDTO = new EsPatentFamilyDTO();
 
+        //不存在no
         List<String> absentList = new ArrayList<>();
+        //存在no
+        List<String> existList = new ArrayList<>();
 
         for (String no : nos) {
             SearchRequest.Builder builder = new SearchRequest.Builder();
@@ -349,6 +352,7 @@ public class EsService {
                     esDTO.setPatentFamilyId(id);
                 }
                 esDTO.setFamilyNum(list.size());
+                existList.add(no);
             } else {
                 //获取不存在的号码
                 absentList.add(no);
@@ -356,10 +360,12 @@ public class EsService {
             }
         }
         //todo 判断是否全新/部分
-        if (absentList.size() == nos.size()) {
-
-        } else {
-
+        if (existList.size() != nos.size()) {
+            if (absentList.size() == nos.size()) {
+                //插入
+            } else {
+                //更新
+            }
         }
 
         return esDTO;

+ 12 - 12
src/main/resources/jsons/patent.json

@@ -317,7 +317,7 @@
     "value": "appProvince",
     "field": "appProvince",
     "esField": "applicant_addr.province",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -329,7 +329,7 @@
     "value": "appCity",
     "field": "appCity",
     "esField": "applicant_addr.city",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -341,7 +341,7 @@
     "value": "appDistrict",
     "field": "appDistrict",
     "esField": "applicant_addr.district",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -377,7 +377,7 @@
     "value": "rightProvince",
     "field": "rightProvince",
     "esField": "right_holder_addr.province",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -389,7 +389,7 @@
     "value": "rightCity",
     "field": "rightCity",
     "esField": "right_holder_addr.city",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -401,7 +401,7 @@
     "value": "rightDistrict",
     "field": "rightDistrict",
     "esField": "right_holder_addr.district",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -413,7 +413,7 @@
     "value": "MC",
     "field": "MC",
     "esField": "mipc",
-    "esClass": "matchPhasePrefixQueryBuilder",
+    "esClass": "prefixQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
     "ifShow": "true",
@@ -424,7 +424,7 @@
     "type": "String",
     "value": "mipcLevel1",
     "field": "mipcLevel1",
-    "esField": "mipc.level1",
+    "esField": "mipc.level1.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -436,7 +436,7 @@
     "type": "String",
     "value": "mipcLevel2",
     "field": "mipcLevel2",
-    "esField": "mipc.level2",
+    "esField": "mipc.level2.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -448,7 +448,7 @@
     "type": "String",
     "value": "mipcLevel3",
     "field": "mipcLevel3",
-    "esField": "mipc.level3",
+    "esField": "mipc.level3.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -460,7 +460,7 @@
     "type": "String",
     "value": "mipcLevel4",
     "field": "mipcLevel4",
-    "esField": "mipc.level4",
+    "esField": "mipc.level4.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -472,7 +472,7 @@
     "type": "String",
     "value": "mipcLevel5",
     "field": "mipcLevel5",
-    "esField": "mipc.level5",
+    "esField": "mipc.level5.keyword",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",