Es检索

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

@@ -92,13 +92,14 @@ public class EsService {
     }
 
     /**
+     * Es检索
      * @param searchCondition 检索条件
      * @param page            检索页码
      * @param size            页大小
      * @param orderFields     排序字段
      * @return
      */
-    public List<Patent> Search(String searchCondition, Integer page, Integer size, List<String> orderFields) throws Exception {
+    public List<Patent> esSearch(String searchCondition, Integer page, Integer size, List<String> orderFields) throws Exception {
         SearchRequest.Builder builder = new SearchRequest.Builder();
         //设置查询索引
         builder.index("patent");

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

@@ -381,16 +381,25 @@ public class FormatQueryService {
         return reQuery;
     }
 
+    /**
+     * Es检索
+     * @param node
+     * @param configName
+     * @return
+     * @throws ParseException
+     */
     public Query EsQueryToQuery(operateNode node, String configName) throws ParseException {
         Query query = null;
         operate operate1 = node.getoperate();
         treeNode Left = node.getLeft();
         treeNode Right = node.getRight();
+        //如果and or  则递归本身
         if (operate1.getShowName().equals(enuType.Logic)) {
             Query q1 = this.EsQueryToQuery((operateNode) Left, configName);
             Query q2 = this.EsQueryToQuery((operateNode) Right, configName);
             query = QueryBuilders.bool(i -> i.must(q1, q2));
         } else if (operate1.getShowName().equals(enuType.Assignment)){
+            //比较运算符
             IQueryBuilder iQueryBuilder = null;
             String field = Left.ToString();
             String value = Right.ToString();