合并

src/main/java/cn/cslg/pas/common/dto/PatentDetailDTO.java

@@ -79,7 +79,7 @@ public class PatentDetailDTO {
     private List<String> agent;
 
     //IPC分类号（主）
-    private PatentClassify MC;
+    private PatentClassify mipc;
 
     //IPC集合
     private List<PatentClassify> ipc;
@@ -94,11 +94,11 @@ public class PatentDetailDTO {
     private List<Text> grantFullText;
 
     //专利状态
-    private String SS;
+    private String simpleStatus;
 
     //专利类型
-    private String PT;
+    private String patentType;
 
     //法律状态
-    private List<String> LG;
+    private List<String> legalStatus;
 }

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

@@ -44,8 +44,9 @@ public class PatentController {
     @Autowired
     private MergePersonService mergePersonService;
 
-@Autowired
-private EsService esService;
+    @Autowired
+    private EsService esService;
+
     @Autowired
     private PatentStarApiService patentStarApiService;
 
@@ -89,10 +90,10 @@ private EsService esService;
     @GetMapping("/queryPatentByNo")
     public Response queryPatentByNo(String patentNo) throws Exception {
         PatentWithIdVO patentWithIdVO = esService.getIdByPatentNo(patentNo);
-        if(patentWithIdVO==null){
+        if (patentWithIdVO == null) {
             return Response.success(null);
         }
-       return Response.success(patentWithIdVO.getPatent());
+        return Response.success(patentWithIdVO.getPatent());
 
     }
 
@@ -100,12 +101,13 @@ private EsService esService;
     @GetMapping("/queryPatentByNoFromWeb")
     public Response queryPatentByNoFromWeb(String patentNo) throws Exception {
         StarPatentVO starPatentVO = patentStarApiService.getPatentByNo(patentNo);
-        if(starPatentVO==null){
+        if (starPatentVO == null) {
             return Response.success(null);
         }
         return Response.success(starPatentVO);
 
     }
+
     //------------------------合并-----------------------------
     @Operation(summary = "专利列表上新增发明人/权利人/申请人合并")
     @PostMapping("/mergePerson")

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

@@ -177,20 +177,20 @@ public class EsService {
         //3. 从es中检索数据
         Query q = formatQueryService.EsQueryToQuery((operateNode) tree, "patent");
         //判断同族分组
-        if (StringUtils.isNotEmpty(groupField)) {
-            String str = "";
-            switch (groupField) {
-                case "simpleFamilyId":
-                    str = "simple_family_id";
-                    break;
-                case "inpadocFamilyId":
-                    str = "inpadoc_family_id";
-                    break;
-                case "patsnapFamilyId":
-                    str = "patsnap_family_id";
-                    break;
-            }
-            String esField = str;
+        String str = "";
+        switch (groupField) {
+            case "simpleFamilyId":
+                str = "simple_family_id";
+                break;
+            case "inpadocFamilyId":
+                str = "inpadoc_family_id";
+                break;
+            case "patsnapFamilyId":
+                str = "patsnap_family_id";
+                break;
+        }
+        String esField = str;
+        if (StringUtils.isNotEmpty(esField)) {
             Aggregation hits = AggregationBuilders.topHits(i -> i.size(1));
             Aggregation aggregation = new Aggregation.Builder().terms(new TermsAggregation.Builder()
                     .field(esField).build())
@@ -923,6 +923,7 @@ public class EsService {
 
     /**
      * 装载摘要附图
+     *
      * @param patentColumnDTOS
      * @return
      */