2/24

RMS/src/main/java/cn/cslg/report/common/model/vo/PatentVO.java

@@ -45,7 +45,7 @@ public class PatentVO extends BaseVO {
     @Schema(description = "自定义字段选项列表")
     private List<SourceVO> filedOptions;
     @Schema(description = "专题库自定义选项列表")
-    private List<SourceVO> PasOptions;
+    private List<SourceVO> pasOptions;
     @Schema(description = "未处理任务类型列表")
     private List<Integer> notAssignTypes;
     @Schema(description = "任务过滤条件列表")
@@ -87,10 +87,17 @@ public class PatentVO extends BaseVO {
     private String orderType;
 
     private String orderItem;
+
+    @Schema(description = "添加的专利号列表",required = true)
+    private List<String> isAdd;
+    @Schema(description = "减少的专利号列表",required = true)
+    private List<String> isDelete;
+
     @Data
     public  static class taskSource{
         private  List<Integer> taskIds;
         private Integer personId;
         private Integer state;
     }
+
 }

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

@@ -27,8 +27,8 @@ public class CompareController {
 
     @RequestMapping(value = "/addCompareFile", method = RequestMethod.POST)
     @Operation(summary = "添加对比文件")
-    public String addCompareFile(@RequestBody CompareFilesVO compareFilesVO) throws IOException {
-        String res =   compareFilesService.addCompareFile(compareFilesVO);
+    public String addCompareFile(@RequestBody PatentVO patentVO) throws IOException {
+        String res =   compareFilesService.addCompareFile(patentVO);
         return res;
     }
 

RMS/src/main/java/cn/cslg/report/mapper/AvoidDesignWholeDirectionMapper.java

@@ -1,6 +1,7 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.AvoidDesignWholeDirection;
+import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Repository;
  * @Data 2023/2/2
  */
 @Repository
-public interface AvoidDesignWholeDirectionMapper {
+public interface AvoidDesignWholeDirectionMapper  {
     /**
      * 插入回避设计总体方向表数据
      *

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -349,38 +349,14 @@ public class OutInterfaceService {
         queryWrapper.eq(ImportTask::getReportId, patentVO.getReportId());
         List<ImportTask> importTasks = importTaskService.list(queryWrapper);
         List<Integer> taskIds = importTasks.stream().map(ImportTask::getId).collect(Collectors.toList());
-        Map<String, Object> map = new HashMap<>();
         Report report = reportService.getById(patentVO.getReportId());
         if (type == 0) {
-            map.put("projectId", report.getProjectId());
-            map.put("importTaskId", taskIds);
+            patentVO.setProjectId(report.getProjectId());
+             patentVO.setImportTaskId(taskIds);
+
         }
-        //专利名称
-        map.put("patentName",patentVO.getPatentName());
-        //专利摘要
-        map.put("abstractStr",patentVO.getAbstractStr());
-        map.put("size", patentVO.getSize());
-        map.put("current", patentVO.getCurrent());
-        map.put("patentNos", patentVO.getPatentNos());
-        //申请人名字
-        map.put("applicationName",patentVO.getApplicationName());
-        //申请号
-        map.put("applicationNo",patentVO.getApplicationNo());
-        //专利号
-        map.put("patentNo",patentVO.getPatentNo());
-        //权利人名字
-        map.put("obligeeName" ,patentVO.getObligeeName());
-        map.put("notInPatentNos", patentVO.getNotInPatentNos());
-        //分类号（IPC,UPC,CPC)
-        map.put("numberCpc",patentVO.getNumberCpc());
-        map.put("numberIpc",patentVO.getNumberIpc());
-        map.put("numberUpc",patentVO.getNumberUpc());
-        map.put("startNumber", patentVO.getStartNumber());
-        map.put("endNumber", patentVO.getEndNumber());
-        map.put("orderType",patentVO.getOrderType());
-        map.put("orderItem",patentVO.getOrderItem());
-        JSONObject json = new JSONObject(map);
-        RequestBody requestBody = RequestBody.create(JSON, String.valueOf(json));
+        String param = new Gson().toJson(patentVO);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient.Builder()
                 .connectTimeout(60, TimeUnit.SECONDS)
                 .writeTimeout(60, TimeUnit.SECONDS)
@@ -459,13 +435,10 @@ public class OutInterfaceService {
         map.put("projectId", report.getProjectId());
         List<ImportTask> importTasks = importTaskService.list(queryWrapper);
         List<Integer> taskIds = importTasks.stream().map(ImportTask::getId).collect(Collectors.toList());
-        map.put("importTaskId", taskIds);
-
-        map.put("startNumber", patentVO.getStartNumber());
-        map.put("endNumber", patentVO.getEndNumber());
-        map.put("patentNos", patentVO.getPatentNos());
-        JSONObject json = new JSONObject(map);
-        RequestBody requestBody = RequestBody.create(JSON, String.valueOf(json));
+        patentVO.setProjectId(report.getProjectId());
+        patentVO.setImportTaskId(taskIds);
+        String param = new Gson().toJson(patentVO);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/system/getComPantentNos")

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

@@ -58,9 +58,9 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
      * @function 添加对比文件
      */
     @Transactional(rollbackFor = Exception.class)
-    public String addCompareFile(CompareFilesVO compareFilesVO) throws IOException {
+    public String addCompareFile(PatentVO patentVO) throws IOException {
         //查询标的专利信息
-        Report report = reportService.getById(compareFilesVO.getReportId());
+        Report report = reportService.getById(patentVO.getReportId());
         //根据标的专利号获得专利信息
         String res1 = outInterfaceService.getPatentFromPAS(report.getSignPatentNo());
         JSONObject res1Object = JSONObject.parseObject(res1);
@@ -72,28 +72,32 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         List<String> familyPatentNos = new ArrayList<>();
         if (patentNoJSON.containsKey("family")) {
             String familyJson = patentNoJSON.get("family").toString();
-            familyPatentNos = JsonUtils.jsonToList(JsonUtils.objectToJson(familyJson), String.class);
+            JSONObject jsonObject = JSONObject.parseObject(familyJson);
+            String  simpleJson = jsonObject.get("simple").toString();
+            familyPatentNos = JSONArray.parseArray(simpleJson,String.class);
         }
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
         //根据报告id 获取文件对比表的详情
-        queryWrapper.eq(CompareFiles::getReportId, compareFilesVO.getReportId());
+        queryWrapper.eq(CompareFiles::getReportId, patentVO.getReportId());
         List<CompareFiles> compareFile1 = this.list(queryWrapper);
         //获取对比文件对比表的专利号
         List<String> patentNoList = compareFile1.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         List<CompareFiles> compareFiles = new ArrayList<>();
-        PatentVO patentVO = new PatentVO();
-        patentVO.setStartNumber(compareFilesVO.getStartNumber() - 1);
-        patentVO.setEndNumber(compareFilesVO.getEndNumber());
-        patentVO.setReportId(compareFilesVO.getReportId());
-        patentVO.setPatentNos(patentNoList);
-        // 见outInterfaceService getComPatentNos接口
-        String res = outInterfaceService.getComPatentNos(patentVO);
-        JSONObject jsonObject = JSONObject.parseObject(res);
-        List<String> patentNos = JSONArray.parseArray(jsonObject.get("data").toString(), String.class);
+        patentVO.setNotInPatentNos(patentNoList);
+
+        List<String> patentNos =new ArrayList<>();
+        if(patentVO.getStartNumber()<=patentVO.getEndNumber()){
+            // 见outInterfaceService getComPatentNos接口
+            patentVO.setStartNumber(patentVO.getStartNumber()-1);
+            patentVO.setEndNumber(patentVO.getEndNumber()-patentVO.getStartNumber());
+            String res = outInterfaceService.getComPatentNos(patentVO);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            patentNos = JSONArray.parseArray(jsonObject.get("data").toString(), String.class);
+        }
         //删除原有的
-        patentNos.removeAll(compareFilesVO.getIsDelete());
+        patentNos.removeAll(patentVO.getIsDelete());
         //添加新的
-        patentNos.addAll(compareFilesVO.getIsAdd());
+        patentNos.addAll(patentVO.getIsAdd());
         //获取对比文件对比表的专利号
         patentNos.removeAll(patentNoList);
         List<String> flags =new ArrayList<>();
@@ -102,7 +106,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             if(!flags.contains(patentNos.get(i))){
                 //根据专利号和报告id造对象
                 compareFiles1.setPatentNo(patentNos.get(i));
-                compareFiles1.setReportId(compareFilesVO.getReportId());
+                compareFiles1.setReportId(patentVO.getReportId());
                 //区分对比文件的类型
                 if (familyPatentNos != null && quotes.size() != 0 && quotes.contains(patentNos.get(i))) {
                     compareFiles1.setRemark("引");
@@ -315,9 +319,9 @@ else if(patentVO.getOrderItem()!=null&&patentVO.getOrderItem().equals("SysOrder"
         if (compareFilesVO.getStartNumber() != null && compareFilesVO.getEndNumber() != null && compareFilesVO.getEndNumber() > compareFilesVO.getStartNumber()) {
             LambdaQueryWrapper<CompareFiles> wrapper = new LambdaQueryWrapper<>();
             wrapper.select(CompareFiles::getPatentNo)
-                    .eq(CompareFiles::getReportId, compareFilesVO.getReportId())
+                    .eq(CompareFiles::getReportId, compareFilesVO.getReportId()).orderByAsc(CompareFiles::getPatentNo)
                     //分页查询 传的起始条数和结束条数
-                    .last("limit " + (compareFilesVO.getStartNumber() - 1) + "," + compareFilesVO.getEndNumber());
+                    .last("limit " + (compareFilesVO.getStartNumber() - 1) + "," + (compareFilesVO.getEndNumber()-compareFilesVO.getStartNumber()+1));
             patentNos = this.list(wrapper).stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         }
         //减少的专利号