修改对比记录接口 2022/11/28

RMS/src/main/java/cn/cslg/report/controller/CompareController.java

@@ -24,12 +24,6 @@ import java.util.List;
 public class CompareController {
     private final CompareFilesService compareFilesService;
 
-//    @RequestMapping(value = "/addCompareFile", method = RequestMethod.POST)
-//    @Operation(summary = "添加对比文件")
-//    public String addCompareFile(@RequestBody CompareFilesVO compareFilesVO) throws IOException {
-//     String res =   compareFilesService.addCompareFile(compareFilesVO);
-//        return res;
-//    }
     @RequestMapping(value = "/addCompareFile", method = RequestMethod.POST)
     @Operation(summary = "添加对比文件")
     public String addCompareFile(@RequestBody CompareFilesVO compareFilesVO) throws IOException {
@@ -43,6 +37,7 @@ public class CompareController {
         String res = compareFilesService.getCompareFile(patentVO);
         return res;
     }
+
     @RequestMapping(value = "/getSureCompareFile", method = RequestMethod.POST)
     @Operation(summary = "获得已确定的对比文件详情(分页）")
     public String getSureCompareFile(@RequestBody PatentVO patentVO) throws IOException {
@@ -56,9 +51,9 @@ public class CompareController {
         String res = compareFilesService.getCompareNos(reportId);
         return res;
     }
+
     @RequestMapping(value = "/deleteCompareNo", method = RequestMethod.POST)
     @Operation(summary = "删除多个对比专利")
-
     public String deleteCompareNo(@RequestBody  CompareFilesVO compareFilesVO) throws IOException {
         String res = compareFilesService.deletePatentNo(compareFilesVO);
         return res;

RMS/src/main/java/cn/cslg/report/controller/CompareRecordsController.java

@@ -44,7 +44,6 @@ public class CompareRecordsController {
     @PostMapping(value = "/selectCompareRecord")
     @Operation(summary ="查询对比记录")
     public String getCompareRecords(@RequestBody CompareRecords compareRecord)throws IOException{
-
       return compareRecordsService.getCompareRecords(compareRecord);
     }
 

RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java

@@ -3,6 +3,7 @@ package cn.cslg.report.service.business;
 import cn.cslg.report.common.model.vo.CompareFilesVO;
 import cn.cslg.report.common.model.vo.PatentVO;
 
+import cn.cslg.report.common.utils.JsonUtils;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.CompareFiles;
 import cn.cslg.report.entity.Report;
@@ -40,8 +41,15 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         String res1 = outInterfaceService.getPatentFromPAS( report.getSignPatentNo());
         JSONObject res1Object = JSONObject.parseObject(res1);
         JSONObject patentNoJSON = JSONObject.parseObject(res1Object.get("data").toString());
+            //获得引用专利号
             String quote =patentNoJSON.get("quote").toString().replace(" ","");
             List<String> quotes = Arrays.asList(quote.split("\\|"));
+            //获得同族专利号
+        List<String> familyPatentNos =new ArrayList<>();
+        if(patentNoJSON.containsKey("family")) {
+            String familyJson = patentNoJSON.get("family").toString();
+            familyPatentNos = JsonUtils.jsonToList(JsonUtils.objectToJson(familyJson), String.class);
+        }
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CompareFiles::getReportId, compareFilesVO.getReportId());
         List<CompareFiles> compareFile1 = this.list(queryWrapper);
@@ -58,15 +66,19 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         patentNos.removeAll(compareFilesVO.getIsDelete());
         patentNos.addAll(compareFilesVO.getIsAdd());
         patentNos.removeAll(patentNoList);
-        patentNos.forEach(item -> {
+        for(int i=0;i<patentNos.size();i++){
             CompareFiles compareFiles1 = new CompareFiles();
-            compareFiles1.setPatentNo(item);
+            compareFiles1.setPatentNo(patentNos.get(i));
             compareFiles1.setReportId(compareFilesVO.getReportId());
-            if(quotes.contains(item)){
+            if (quotes.size() != 0 && quotes.contains(patentNos.get(i))) {
                 compareFiles1.setRemark("引");
             }
+            if (familyPatentNos.size() != 0 && familyPatentNos.contains(patentNos.get(i))) {
+                compareFiles1.setRemark("同");
+            }
             compareFiles.add(compareFiles1);
-        });
+        }
+
         this.saveBatch(compareFiles);
         return Response.success();
     }

RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java

@@ -38,6 +38,7 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
     public final LoginUtils loginUtils;
     public final FeatureService featureService;
     public final AssoRecordsFeatureService assoRecordsFeatureService;
+    public final CompareFilesService compareFilesService;
 
     @Transactional(rollbackFor = Exception.class)
     public String addCompareRecord(CompareRecords compareRecord) throws IOException {
@@ -69,12 +70,10 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
 
         LambdaQueryWrapper<CompareRecords> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CompareRecords::getReportId, compareRecord.getReportId());
-
         if (compareRecord.getPatentNo() != null) {
             wrapper.eq(CompareRecords::getPatentNo, compareRecord.getPatentNo());
         }
         if(compareRecord.getTaskId()!=null){
-
            wrapper.eq(CompareRecords::getTaskId,compareRecord.getTaskId());
         }
         List<CompareRecords> list = new ArrayList<>();
@@ -107,9 +106,17 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
             records.setFeatures(featuresList);
             if(!headerPatentNos.contains(records.getPatentNo())){
             headerPatentNos.add(records.getPatentNo());}
+}
+        List<CompareFiles> compareFiles =new ArrayList<>();
+        if(headerPatentNos.size()!=0){
+            LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.in(CompareFiles::getPatentNo,headerPatentNos);
+             compareFiles =compareFilesService.list(lambdaQueryWrapper);
+
         }
+
         Map<String,Object> map =new HashMap<>();
-        map.put("tableHeader",headerPatentNos);
+        map.put("tableHeader",compareFiles);
         map.put("records",compareRecords);
         return Response.success(map);
     }