fixed

src/main/java/cn/cslg/pas/controller/outApi/PatentStarController.java

@@ -1,10 +1,12 @@
 package cn.cslg.pas.controller.outApi;
 
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.PatentColumnDTO;
 import cn.cslg.pas.common.dto.PatentStarListDTO;
 import cn.cslg.pas.common.dto.business.SelectClaimDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.vo.business.PatentNoVO;
 import cn.cslg.pas.service.common.PatentStarApiService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -98,4 +100,11 @@ public class PatentStarController {
         SelectClaimDTO dto = patentStarApiService.selectClaim(patentNo);
         return Response.success(dto);
     }
+
+    @Operation(summary = "查询外部专利详情")
+    @PostMapping("/queryExternalDetail")
+    public Response queryExternalDetail(@RequestBody PatentNoVO vo) throws Exception {
+        PatentColumnDTO dto = patentStarApiService.queryExternalDetail(vo);
+        return Response.success(dto);
+    }
 }

src/main/java/cn/cslg/pas/service/business/MergePersonService.java

@@ -247,11 +247,17 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
     }
 
     public Records getMergePerson(GetAllPersonVO vo) throws Exception {
-        String searchCondition = "";
         Integer projectId = vo.getProjectId();
         Integer taskId = vo.getTaskId();
         Integer pageNum = vo.getPageNum();
         Integer pageSize = vo.getPageSize();
+        Integer type = vo.getType();
+        String searchCondition = "";
+        if (type == 0) {
+            searchCondition = searchCondition + "MAT = " + vo.getName();
+        } else {
+            searchCondition = searchCondition + "MAT = " + vo.getName();
+        }
         if (taskId != null) {
             searchCondition = "taskId = " + taskId;
         } else {

src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -12,6 +12,7 @@ import cn.cslg.pas.common.model.importTaskModel.PatentApplicant;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.vo.ContentVO;
 import cn.cslg.pas.common.vo.StarPatentVO;
+import cn.cslg.pas.common.vo.business.PatentNoVO;
 import cn.cslg.pas.domain.WebLoginConfig;
 import cn.cslg.pas.domain.business.RetrieveRecord;
 import cn.cslg.pas.domain.es.PatentClassify;
@@ -848,26 +849,23 @@ public class PatentStarApiService {
                 patentColumnDTO.setInventor(names);
             }
 
-
-
             //装载权利人
             if (item.getCurrentApplicantStr() != null && !item.getCurrentApplicantStr().trim().equals("")) {
                 List<String> names = Arrays.asList(item.getCurrentApplicantStr().split(";"));
                 patentColumnDTO.setRightHolder(names);
             }
 
-
             //装载代理人
             if (item.getAgentStr() != null && !item.getAgentStr().trim().equals("")) {
                 List<String> names = Arrays.asList(item.getAgentStr().split(";"));
                 patentColumnDTO.setAgent(names);
             }
+
             //装载代理机构
             if (item.getAgencyStr() != null && !item.getAgencyStr() .trim().equals("")) {
                 patentColumnDTO.setAgency(item.getAgencyStr() );
             }
 
-
             patentColumnDTOS.add(patentColumnDTO);
         });
 
@@ -903,4 +901,32 @@ public class PatentStarApiService {
         return dto;
     }
 
+    /**
+     * 根据专利号查询外部权利要求
+     * @param vo
+     * @return
+     * @throws IOException
+     */
+    public PatentColumnDTO queryExternalDetail(PatentNoVO vo) throws IOException {
+        PatentStarListDTO patentStarListDTO = new PatentStarListDTO();
+        String condition = "AN=" + vo.getPatentNo();
+        patentStarListDTO.setCurrentQuery(condition);
+        patentStarListDTO.setDBType("CN");
+        patentStarListDTO.setOrderBy("AD");
+        patentStarListDTO.setOrderByType("DESC");
+        patentStarListDTO.setPageNum(1);
+        patentStarListDTO.setRowCount(10);
+        Records records = this.patentStarSearchLocal(patentStarListDTO);
+        Object data = records.getData();
+        String s = JSONArray.toJSONString(data);
+        List<PatentColumnDTO> list = JSONArray.parseArray(s, PatentColumnDTO.class);
+        PatentColumnDTO dto = new PatentColumnDTO();
+        if (!CollectionUtils.isEmpty(list)) {
+            for (PatentColumnDTO columnDTO : list) {
+                BeanUtils.copyProperties(columnDTO, dto);
+            }
+        }
+        return dto;
+    }
+
 }

src/main/resources/jsons/esCountAnalysis.json

@@ -208,7 +208,7 @@
     "type": "String",
     "value": "standerApplicant",
     "field": "SAT",
-    "esField": "stander_applicant.name.key",
+    "esField": "stander_applicant.name.raw",
     "esClass": "nestedCountAnalysisBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -220,7 +220,7 @@
     "type": "String",
     "value": "mergeApplicant",
     "field": "MAT",
-    "esField": "merge_applicant.name.key",
+    "esField": "merge_applicant.name.raw",
     "esClass": "nestedCountAnalysisBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -244,7 +244,7 @@
     "type": "String",
     "value": "standerRightHolder",
     "field": "SRH",
-    "esField": "stander_right_holder.name.key",
+    "esField": "stander_right_holder.name.raw",
     "esClass": "nestedCountAnalysisBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -256,7 +256,7 @@
     "type": "String",
     "value": "mergeRightHolder",
     "field": "MRH",
-    "esField": "merge_right_holder.name.key",
+    "esField": "merge_right_holder.name.raw",
     "esClass": "nestedCountAnalysisBuilder",
     "ifSearch": "false",
     "ifGroup": "false",
@@ -276,6 +276,18 @@
     "ifAsCondition": "true"
   },
   {
+    "name": "合并发明人",
+    "type": "Array",
+    "value": "mergeRightHolder",
+    "field": "MIN",
+    "esField": "merge_inventor.name.raw",
+    "esClass": "nestedCountAnalysisBuilder",
+    "ifSearch": "false",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifAsCondition": "true"
+  },
+  {
     "name": "代理机构",
     "type": "String",
     "value": "agency",

src/main/resources/jsons/patent.json

@@ -171,7 +171,7 @@
     "type": "String",
     "value": "standerApplicant",
     "field": "SAT",
-    "esField": "stander_applicant.name.key",
+    "esField": "stander_applicant.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "false",
@@ -185,7 +185,7 @@
     "type": "String",
     "value": "mergeApplicant",
     "field": "MAT",
-    "esField": "merge_applicant.name.key",
+    "esField": "merge_applicant.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "false",
@@ -209,6 +209,20 @@
     "groupBy": "company"
   },
   {
+    "name": "合并发明人",
+    "type": "Array",
+    "value": "mergeRightHolder",
+    "field": "MIN",
+    "esField": "merge_inventor.name",
+    "esClass": "nestedQueryBuilder",
+    "ifSearch": "true",
+    "ifGroup": "false",
+    "ifShow": "true",
+    "ifStats": "true",
+    "ifAsCondition": "true",
+    "groupBy": "company"
+  },
+  {
     "name": "权利人",
     "type": "Array",
     "value": "rightHolder",
@@ -227,7 +241,7 @@
     "type": "String",
     "value": "standerRightHolder",
     "field": "SRH",
-    "esField": "stander_right_holder.name.key",
+    "esField": "stander_right_holder.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "false",
@@ -241,7 +255,7 @@
     "type": "String",
     "value": "mergeRightHolder",
     "field": "MRH",
-    "esField": "merge_right_holder.name.key",
+    "esField": "merge_right_holder.name",
     "esClass": "nestedQueryBuilder",
     "ifSearch": "true",
     "ifGroup": "false",