es检索

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

@@ -3,6 +3,7 @@ package cn.cslg.pas.service.business.es;
 import cn.cslg.pas.common.core.base.IfConstant;
 import cn.cslg.pas.common.dto.PatentColumnDTO;
 import cn.cslg.pas.common.dto.PatentDTO;
+import cn.cslg.pas.common.dto.business.EsPatentFamilyDTO;
 import cn.cslg.pas.common.model.request.MapRequest;
 import cn.cslg.pas.common.model.request.OrderDTO;
 import cn.cslg.pas.common.model.request.QueryRequest;
@@ -166,7 +167,7 @@ public class EsService {
         } else {
             builder.sort(sortOptionsBuilder -> sortOptionsBuilder
                     .field(fieldSortBuilder -> fieldSortBuilder
-                            .field("public_date").order(SortOrder.Desc)));
+                            .field("patent_no").order(SortOrder.Desc)));
         }
 
         //分页

src/main/resources/jsons/patent.json

@@ -172,7 +172,7 @@
     "type": "String",
     "value": "PA",
     "field": "PA",
-    "esField": "applicant",
+    "esField": "applicant.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -184,7 +184,7 @@
     "type": "String",
     "value": "IN",
     "field": "IN",
-    "esField": "inventor",
+    "esField": "inventor.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -196,7 +196,7 @@
     "type": "String",
     "value": "PE",
     "field": "PE",
-    "esField": "right_holder",
+    "esField": "right_holder.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -276,18 +276,6 @@
     "ifAsCondition": "true"
   },
   {
-    "name": "申请国家",
-    "type": "String",
-    "value": "appCountry",
-    "field": "appCountry",
-    "esField": "app_country",
-    "esClass": "keyWordQueryBuilder",
-    "ifSearch": "false",
-    "ifGroup": "false",
-    "ifShow": "true",
-    "ifAsCondition": "true"
-  },
-  {
     "name": "申请人地址",
     "type": "String",
     "value": "DZ",
@@ -518,8 +506,8 @@
   {
     "name": "专利状态",
     "type": "String",
-    "value": "simpleStatus",
-    "field": "simpleStatus",
+    "value": "SS",
+    "field": "SS",
     "esField": "simple_status",
     "esClass": "keyWordQueryBuilder",
     "ifSearch": "false",

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -124,12 +124,17 @@ public class EventServiceTests {
 //        mapRequest.setSize(50L);
 //        mapRequest.setProjectId(1);
         StringRequest stringRequest = new StringRequest();
-//        stringRequest.setSearchQuery("PN=CN114513005A");
+        stringRequest.setSearchQuery("agent=李桂存");
+//        stringRequest.setSearchQuery("IN=郝旭东");
+//        stringRequest.setSearchQuery("simpleStatus=3");
+//        stringRequest.setSearchQuery("CL=一种考虑电流限制和出力水平的分布式光伏机电暂态建模方法");
+//        stringRequest.setSearchQuery("AB=一种考虑电流限制和出力水平的分布式光伏机电暂态模型");
+//        stringRequest.setSearchQuery("PN=CN114513005B");
 //        stringRequest.setSearchQuery("AN=CN201810025278.2");
-        stringRequest.setSearchQuery("patentNo=CN");
-//        stringRequest.setSearchQuery("publicDate<=200903");
+//        stringRequest.setSearchQuery("patentNo=CN");
+//        stringRequest.setSearchQuery("PD<=200903");
 //        stringRequest.setSearchQuery("patentNo=CN201199922Y and (simpleFamilyNum>1 or simpleFamilyNum=0)");
-        stringRequest.setCurrent(3L);
+        stringRequest.setCurrent(1L);
         stringRequest.setSize(5L);
 //        stringRequest.setProjectId(1);
 //