es檢索

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

@@ -179,29 +179,29 @@ public class EsService {
         //4. 返回数据
         builder.query(q);
         //排序
-//        List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
-//        if (!CollectionUtils.isEmpty(dtoList)) {
-//            String json = CommonService.readJsonFile("patent.json");
-//            List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
-//            for (OrderDTO orderDTO : dtoList) {
-//                EsConfigVO configVO = esConfigVOS.stream().filter(item -> item.getField().equals(orderDTO.getOrderBy())).findFirst().orElse(null);
-//                if (configVO != null) {
-//                    if (orderDTO.getOrderType().equals(IfConstant.NO)) {
-//                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-//                                .field(fieldSortBuilder -> fieldSortBuilder
-//                                        .field(configVO.getEsField()).order(SortOrder.Asc)));
-//                    } else {
-//                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-//                                .field(fieldSortBuilder -> fieldSortBuilder
-//                                        .field(configVO.getEsField()).order(SortOrder.Desc)));
-//                    }
-//                }
-//            }
-//        } else {
-//            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
-//                    .field(fieldSortBuilder -> fieldSortBuilder
-//                            .field("patent_no.keyword").order(SortOrder.Desc)));
-//        }
+        List<OrderDTO> dtoList = queryRequest.getOrderDTOList();
+        if (!CollectionUtils.isEmpty(dtoList)) {
+            String json = CommonService.readJsonFile("patent.json");
+            List<EsConfigVO> esConfigVOS = JSON.parseArray(json, EsConfigVO.class);
+            for (OrderDTO orderDTO : dtoList) {
+                EsConfigVO configVO = esConfigVOS.stream().filter(item -> item.getField().equals(orderDTO.getOrderBy())).findFirst().orElse(null);
+                if (configVO != null) {
+                    if (orderDTO.getOrderType().equals(IfConstant.NO)) {
+                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                                .field(fieldSortBuilder -> fieldSortBuilder
+                                        .field(configVO.getEsField()).order(SortOrder.Asc)));
+                    } else {
+                        builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                                .field(fieldSortBuilder -> fieldSortBuilder
+                                        .field(configVO.getEsField()).order(SortOrder.Desc)));
+                    }
+                }
+            }
+        } else {
+            builder.sort(sortOptionsBuilder -> sortOptionsBuilder
+                    .field(fieldSortBuilder -> fieldSortBuilder
+                            .field("patent_no.keyword").order(SortOrder.Desc)));
+        }
 
         //分页
         if (current > 0 && size > 0) {

src/main/resources/jsons/patent.json

@@ -7,7 +7,7 @@
     "esField": "patent_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false"
@@ -20,7 +20,7 @@
     "esField": "app_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false"
@@ -33,7 +33,7 @@
     "esField": "public_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false"
@@ -46,7 +46,7 @@
     "esField": "grant_no.keyword",
     "esClass": "wildcardQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "false"
@@ -59,7 +59,7 @@
     "esField": "public_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true"
@@ -72,7 +72,7 @@
     "esField": "app_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true"
@@ -85,7 +85,7 @@
     "esField": "grant_date",
     "esClass": "dateQueryBuilder",
     "ifSearch": "true",
-    "ifGroup": "true",
+    "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
     "ifStats": "true"