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

+ 74 - 0
src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/PrioritiesNONestedQueryBuilder.java

@@ -0,0 +1,74 @@
+package cn.cslg.pas.factorys.EsBuilderFactory;
+
+import co.elastic.clients.elasticsearch._types.query_dsl.Query;
+import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class PrioritiesNONestedQueryBuilder implements IQueryBuilder{
+    private String field = "";
+    private String value = "";
+    private String operator = "";
+    public String path = "";
+    public Integer projectId = null;
+
+
+    @Override
+    public Query creteQuery() throws ParseException {
+        List<Query> queries = new ArrayList<>();
+        String[] valueStrs = value.split("[,,]|\\r\\n|\\r|\\n");
+        for (int i = 0; i < valueStrs.length; i++) {
+            String temValue = valueStrs[i];
+            String str = "*";
+            String s = str.concat(temValue).concat("*");
+            Query query = QueryBuilders.wildcard(n -> n.field(field).value(s));
+            Query nestedQuery = QueryBuilders.nested(z -> z.path(path).query(query));
+            queries.add(nestedQuery);
+        }
+        return QueryBuilders.bool(m -> m.should(queries));
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public void setField(String field) {
+        this.field = field;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path;
+    }
+
+    public Integer getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(Integer projectId) {
+        this.projectId = projectId;
+    }
+}

+ 1 - 1
src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/WildcardNosQueryBuilder.java

@@ -24,7 +24,7 @@ public class WildcardNosQueryBuilder implements IQueryBuilder {
         Query query = null;
 
         List<Query> queries = new ArrayList<>();
-        String[] valueStrs = value.split("\\r\\n|,|\\r|\\n|,");
+        String[] valueStrs = value.split("[,,]|\\r\\n|\\r|\\n");
 
 
         for (int i = 0; i < valueStrs.length; i++) {

+ 1 - 1
src/main/java/cn/cslg/pas/factorys/WebQueryFactory/GetWebAppNosQuery.java

@@ -22,7 +22,7 @@ public class GetWebAppNosQuery implements FormWebQueryFieldImp {
             option = "/";
         }
         value = value.trim();
-        String[] valueStrs = value.split("\\s+");
+        String[] valueStrs = value.split("[,,]|\\r\\n|\\r|\\n");
         List<String> queryLists = new ArrayList<>();
 
         for (int i = 0; i < valueStrs.length; i++) {

+ 1 - 1
src/main/java/cn/cslg/pas/factorys/WebQueryFactory/GetWebNosQuery.java

@@ -24,7 +24,7 @@ public class GetWebNosQuery implements FormWebQueryFieldImp {
             option = "/";
         }
         value =value.trim();
-        String[] valueStrs =value.split("\\r\\n|,|\\r|\\n|,");
+        String[] valueStrs =value.split("[,,]|\\r\\n|\\r|\\n");
 
         List<String> queryLists=new ArrayList<>();
 

+ 1 - 1
src/main/java/cn/cslg/pas/factorys/WebQueryFactory/GetWebPatentNosQuery.java

@@ -24,7 +24,7 @@ public class GetWebPatentNosQuery implements FormWebQueryFieldImp {
             option = "/";
         }
         value = value.trim();
-        String[] valueStrs = value.split("\\s+");
+        String[] valueStrs = value.split("[,,]|\\r\\n|\\r|\\n");
         List<String> queryLists = new ArrayList<>();
 
         for (int i = 0; i < valueStrs.length; i++) {

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

@@ -5,7 +5,7 @@
     "value": "patentNo",
     "field": "NO",
     "esField": "patent_no.keyword",
-    "esClass": "wildcardQueryBuilder",
+    "esClass": "wildcardNosQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",
@@ -21,7 +21,7 @@
     "value": "appNo",
     "field": "AN",
     "esField": "app_no.keyword",
-    "esClass": "wildcardQueryBuilder",
+    "esClass": "wildcardNosQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",
@@ -37,7 +37,7 @@
     "value": "publicNo",
     "field": "PN",
     "esField": "public_no.keyword",
-    "esClass": "wildcardQueryBuilder",
+    "esClass": "wildcardNosQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",
@@ -53,7 +53,7 @@
     "value": "grantNo",
     "field": "GN",
     "esField": "grant_no.keyword",
-    "esClass": "wildcardQueryBuilder",
+    "esClass": "wildcardNosQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",
@@ -1156,7 +1156,7 @@
     "value": "priorityNo",
     "field": "PRN",
     "esField": "priorities.priorityno",
-    "esClass": "nestedPersonQueryBuilder",
+    "esClass": "prioritiesNONestedQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "true",
     "ifShow": "true",