Przeglądaj źródła

fixed 检索统计

zero 1 rok temu
rodzic
commit
906b81cd2a

+ 8 - 0
src/main/java/cn/cslg/pas/common/utils/parseQueryToTree/expressManager.java

@@ -93,6 +93,14 @@ public class expressManager {
         hSymbols.put(oOR.Code, oOR);
 
         oOR = new operate();
+        oOR.Code = "CONTAIN";
+        oOR.ShowName = " LIKE ";
+        oOR.type = enuType.Assignment;
+        oOR.priorityVale = 20;
+        oOR.operateValue = 2;
+        hSymbols.put(oOR.Code, oOR);
+
+        oOR = new operate();
         oOR.Code = "≡";
         oOR.ShowName = " LIKE ";
         oOR.type = enuType.Assignment;

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

@@ -18,11 +18,11 @@ public class NestedPersonQueryBuilder implements IQueryBuilder{
     public Query creteQuery() throws ParseException {
         Query query = null;
         if (operator.equals("=")) {
-            query = QueryBuilders.term(i -> i.field(field).value(value));
-        } else {
             String str = "*";
             String s = str.concat(value).concat("*");
             query = QueryBuilders.wildcard(i -> i.field(field).value(s));
+        } else {
+            query = QueryBuilders.term(i -> i.field(field).value(value));
         }
         Query finalQuery = query;
         Query nestedQuery = QueryBuilders.nested(z -> z.path(path).query(finalQuery));

+ 3 - 3
src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/NestedQueryBuilder.java

@@ -15,13 +15,13 @@ public class NestedQueryBuilder implements IQueryBuilder {
     public Query creteQuery() {
         Query nestedQuery = null;
         if (operator.equals("=")) {
-            Query query = QueryBuilders.term(i -> i.field(field).value(value));
-            nestedQuery = QueryBuilders.nested(z -> z.path(path).query(query));
-        } else {
             String str = "*";
             String s = str.concat(value).concat("*");
             Query query =  QueryBuilders.wildcard(i -> i.field(field).value(s));
             nestedQuery = QueryBuilders.nested(z -> z.path(path).query(query));
+        } else {
+            Query query = QueryBuilders.term(i -> i.field(field).value(value));
+            nestedQuery = QueryBuilders.nested(z -> z.path(path).query(query));
         }
         Query childQuery = null;
         if (path.equals("merge_applicant")) {

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

@@ -17,11 +17,11 @@ public class TermOrWildcardQueryBuilder implements IQueryBuilder{
     public Query creteQuery() throws ParseException {
         Query query = null;
         if (operator.equals("=")) {
-            query = QueryBuilders.term(i -> i.field(field).value(value));
-        } else {
             String str = "*";
             String s = str.concat(value).concat("*");
             query =  QueryBuilders.wildcard(i -> i.field(field).value(s));
+        } else {
+            query = QueryBuilders.term(i -> i.field(field).value(value));
         }
         return query;
     }

+ 1 - 0
src/main/java/cn/cslg/pas/service/business/MergePersonService.java

@@ -690,6 +690,7 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
                     queries.add(childQ);
                 }
                 Query bool = QueryBuilders.bool(i -> i.must(mustQ).should(queries));
+                builder.size(99999);
                 builder.query(bool);
                 //分页
 //        if (pageNum > 0 && pageSize > 0) {