Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/service/business/es/EsCountService.java

@@ -72,7 +72,7 @@ public class EsCountService {
             IEsCountBuilder iEsCountBuilder = null;
             String json = CommonService.readJsonFile("esCount.json");
             List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
-            EsConfigVO esConfigVO = esConfigVOS.stream().filter(item -> item.getValue().equals(field)).findFirst().orElse(null);
+            EsConfigVO esConfigVO = esConfigVOS.stream().filter(item -> item.getField().equals(field)).findFirst().orElse(null);
             if (esConfigVO != null) {
                 iEsCountBuilder = esCountBuilderFactory.getClass(esConfigVO.getEsClass());
                 iEsCountBuilder.setField(esConfigVO.getEsField());

src/main/java/cn/cslg/pas/service/query/FormatQueryService.java

@@ -456,7 +456,7 @@ public class FormatQueryService {
                 IQueryBuilder iQueryBuilder = null;
                 String json = CommonService.readJsonFile(configName + ".json");
                 List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
-                EsConfigVO esConfigVO = esConfigVOS.stream().filter(item -> item.getValue().equals(field)).findFirst().orElse(null);
+                EsConfigVO esConfigVO = esConfigVOS.stream().filter(item -> item.getField().equals(field)).findFirst().orElse(null);
                 if (esConfigVO != null) {
                     iQueryBuilder = esBuilderFactory.getClass(esConfigVO.getEsClass());
                     iQueryBuilder.setField(esConfigVO.getEsField());

src/main/resources/jsons/patent.json

@@ -4,7 +4,7 @@
     "type": "String",
     "value": "patentNo",
     "field": "patentNo",
-    "esField": "patent_no",
+    "esField": "patent_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -16,7 +16,7 @@
     "type": "String",
     "value": "appNo",
     "field": "AN",
-    "esField": "app_no",
+    "esField": "app_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -28,7 +28,7 @@
     "type": "String",
     "value": "publicNo",
     "field": "PN",
-    "esField": "public_no",
+    "esField": "public_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -40,7 +40,7 @@
     "type": "String",
     "value": "grantNo",
     "field": "GN",
-    "esField": "grant_no",
+    "esField": "grant_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",