Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/vo/QueryFiledVO.java

@@ -17,6 +17,6 @@ public class QueryFiledVO {
     //栏位选项查询参数
     private String fieldOptionQueryParam;
     private String group;
-
+    private String groupBy;
     private Integer filedType;
 }

src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -42,9 +42,6 @@ public class PatentController {
     @Autowired
     private EsPatentService patentService;
 
-    @Autowired
-    private EsService esService;
-
 
     @Operation(summary = "查询专利")
     @PostMapping("/queryPatent")

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

@@ -10,7 +10,8 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "申请号",
@@ -23,7 +24,8 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "公开号",
@@ -36,7 +38,8 @@
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "授权号",
@@ -45,11 +48,12 @@
     "field": "GN",
     "esField": "grant_no.keyword",
     "esClass": "wildcardQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
-    "ifStats": "false"
+    "ifStats": "false",
+    "groupBy": "number"
   },
   {
     "name": "公开日",
@@ -58,7 +62,7 @@
     "field": "PD",
     "esField": "public_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -71,7 +75,7 @@
     "field": "AD",
     "esField": "app_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -84,7 +88,7 @@
     "field": "GD",
     "esField": "grant_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -123,7 +127,7 @@
     "field": "AB",
     "esField": "abstract_str.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -137,7 +141,7 @@
     "field": "TI",
     "esField": "title.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -149,7 +153,7 @@
     "field": "examinationDate",
     "esField": "examination_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -161,7 +165,7 @@
     "field": "PA",
     "esField": "applicant.name",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -175,7 +179,7 @@
     "field": "SAT",
     "esField": "stander_applicant.name.key",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -188,7 +192,7 @@
     "field": "MAT",
     "esField": "merge_applicant.name.key",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -201,7 +205,7 @@
     "field": "IN",
     "esField": "inventor.name",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -214,7 +218,7 @@
     "field": "PE",
     "esField": "right_holder.name",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -227,7 +231,7 @@
     "field": "SRH",
     "esField": "stander_right_holder.name.key",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -240,7 +244,7 @@
     "field": "MRH",
     "esField": "merge_right_holder.name.key",
     "esClass": "nestedQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -253,7 +257,7 @@
     "field": "PFT",
     "esField": "public_full_text.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
@@ -266,7 +270,7 @@
     "field": "GFT",
     "esField": "grant_full_text.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
@@ -279,7 +283,7 @@
     "field": "AGN",
     "esField": "agency",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -292,7 +296,7 @@
     "field": "AG",
     "esField": "agent.key",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -305,7 +309,7 @@
     "field": "SFN",
     "esField": "simple_family_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -317,7 +321,7 @@
     "field": "IFN",
     "esField": "inpadoc_family_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -329,7 +333,7 @@
     "field": "PFN",
     "esField": "patsnap_family_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -341,7 +345,7 @@
     "field": "QPN",
     "esField": "quote_patent_no_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -353,7 +357,7 @@
     "field": "QDPN",
     "esField": "quoted_patent_no_num",
     "esClass": "numberQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true"
@@ -365,7 +369,7 @@
     "field": "ADD",
     "esField": "applicant_addr.address",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
@@ -378,7 +382,7 @@
     "field": "CO",
     "esField": "app_country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
@@ -391,7 +395,7 @@
     "field": "AAC",
     "esField": "applicant_addr.country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
@@ -404,7 +408,7 @@
     "field": "ADP",
     "esField": "applicant_addr.province",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
@@ -417,7 +421,7 @@
     "field": "ADC",
     "esField": "applicant_addr.city",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
@@ -430,7 +434,7 @@
     "field": "ADA",
     "esField": "applicant_addr.district",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifAsCondition": "true"
@@ -442,7 +446,7 @@
     "field": "RDD",
     "esField": "right_holder_addr.address",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
@@ -455,7 +459,7 @@
     "field": "DZ",
     "esField": "right_holder_addr.country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
@@ -468,7 +472,7 @@
     "field": "RDP",
     "esField": "right_holder_addr.province",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "true",
@@ -481,7 +485,7 @@
     "field": "RDC",
     "esField": "right_holder_addr.city",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifStats": "false",
@@ -494,7 +498,7 @@
     "field": "RDD",
     "esField": "right_holder_addr.district",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifAsCondition": "true"
@@ -506,7 +510,7 @@
     "field": "MC",
     "esField": "mipc",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -584,7 +588,7 @@
     "field": "CPC",
     "esField": "mcpc",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -662,7 +666,7 @@
     "field": "UPC",
     "esField": "mupc",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -714,7 +718,7 @@
     "field": "LOC",
     "esField": "mloc",
     "esClass": "prefixQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -766,7 +770,7 @@
     "field": "CL",
     "esField": "claim.text_content",
     "esClass": "matchQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "false",
     "ifAsCondition": "true"
@@ -778,7 +782,7 @@
     "field": "SS",
     "esField": "simple_status",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -792,7 +796,7 @@
     "field": "PT",
     "esField": "patent_type",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifAsCondition": "true",
@@ -806,7 +810,7 @@
     "field": "LG",
     "esField": "legal_status.raw",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "true",
@@ -819,7 +823,7 @@
     "field": "EXAM",
     "esField": "examiner.key",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -832,7 +836,7 @@
     "field": "ADEXAM",
     "esField": "aid_examiner.key",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -845,11 +849,12 @@
     "field": "PAN",
     "esField": "pctappno",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "number"
   },
   {
     "name": "pct申请日",
@@ -858,7 +863,7 @@
     "field": "PAD",
     "esField": "pctappdate",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -871,7 +876,7 @@
     "field": "PED",
     "esField": "pctenterdate",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -884,11 +889,12 @@
     "field": "PPN",
     "esField": "pctpubno",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "number"
   },
   {
     "name": "pct公开日",
@@ -897,7 +903,7 @@
     "field": "PPD",
     "esField": "pctpubdate",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -910,7 +916,7 @@
     "field": "WOC",
     "esField": "wo",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -923,11 +929,12 @@
     "field": "EPNO",
     "esField": "ep_no",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
-    "ifAsCondition": "true"
+    "ifAsCondition": "true",
+    "groupBy": "number"
   },
   {
     "name": "EP指定国",
@@ -936,7 +943,7 @@
     "field": "EPC",
     "esField": "ep_country",
     "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",
@@ -949,7 +956,7 @@
     "field": "EPD",
     "esField": "ep_date",
     "esClass": "dateQueryBuilder",
-    "ifSearch": "false",
+    "ifSearch": "true",
     "ifGroup": "false",
     "ifShow": "true",
     "ifStats": "false",