12.20 chenyi

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

@@ -61,7 +61,7 @@ public class FeatureController {
 
     @RequestMapping(value = "/getSplitMessage", method = RequestMethod.GET)
     @Operation(summary = "根据专利号和任务Id获得拆分信息")
-    public String getSplitMessage(Integer taskId,String patentNo) throws IOException {
-        return Response.success(assoTaskPatentSplitService.getSplitMessage(taskId,patentNo));
+    public String getSplitMessage(Integer taskId,String patentNo,Integer reportId) throws IOException {
+        return Response.success(assoTaskPatentSplitService.getSplitMessage(taskId,patentNo,reportId));
     }
 }

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

@@ -119,6 +119,12 @@ public class ReportController {
         }
         return Response.error();
     }
-
+    @GetMapping(value = "updateStatus")
+    @Operation(summary = "修改报告状态")
+    @Transactional(rollbackFor = Exception.class)
+    public String updateStatus(Integer reportId,Integer status){
+        reportService.updateStatus(reportId,status);
+        return Response.success();
+    }
 
 }

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

@@ -130,17 +130,17 @@ public class TaskController {
 
     @RequestMapping(value = "/read", method = RequestMethod.GET)
     @Operation(summary = "未读变成已读")
-    private String read(int taskID,String patentNo ){
-        return taskService.read(taskID,patentNo);
+    private String read(int taskID,String patentNo ,Integer reportId){
+        return taskService.read(taskID,patentNo, reportId);
     }
 
     @RequestMapping(value = "/look", method = RequestMethod.GET)
     @Operation(summary = "查看某个专利的状态")
-    private String look(int taskID,String patentNo){
-        return taskService.look(taskID,patentNo);
+    private String look(int taskID,String patentNo,Integer reportId){
+        return taskService.look(taskID,patentNo,reportId);
     }
 
-        @RequestMapping(value = "/addSyneryTask", method = RequestMethod.POST)
+    @RequestMapping(value = "/addSyneryTask", method = RequestMethod.POST)
     @Operation(summary = "添加协同任务")
     public String addSyneryTask(@RequestBody SyneryVO syneryVO) throws ParseException, IOException {
         return taskService.addSyneryTask(syneryVO);

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

@@ -1,6 +1,7 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.entity.AssoComapareFiel;
+import cn.cslg.report.entity.Report;
 import cn.cslg.report.entity.asso.AssoTaskPatentSplit;
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.AssoComapareFielMapper;
@@ -24,6 +25,8 @@ import java.util.Map;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoTaskPatentSplitService extends ServiceImpl<AssoTaskPatentSplitMapper, AssoTaskPatentSplit> {
  private final AssoTaskPersonelService assoTaskPersonelService;
+ private final FeatureService featureService;
+ private final ReportService reportService;
 
     /**
      *
@@ -34,18 +37,34 @@ public class AssoTaskPatentSplitService extends ServiceImpl<AssoTaskPatentSplitM
      * @description 查找任务专利的拆分详情
      */
     @Transactional(rollbackFor = Exception.class)
-    public Map<String,Object> getSplitMessage(Integer taskId, String patentNo) {
-        Map<String,Object> map =new HashMap<>();
-       AssoTaskPatentSplit assoTaskPatentSplit = assoTaskPersonelService.getBaseMapper().getSplitMessage(patentNo,taskId);
-       if(assoTaskPatentSplit!=null){
-           map.put("splitBy",assoTaskPatentSplit.getSplitBy());
-           map.put("splitType",assoTaskPatentSplit.getSplitType());
-       }
-       else {
-           map.put("splitBy",null);
-           map.put("splitType",null);
-       }
-        return map;
+    public Map<String,Object> getSplitMessage(Integer taskId, String patentNo,Integer reportId) {
+        if (taskId != null) {
+            Map<String, Object> map = new HashMap<>();
+            AssoTaskPatentSplit assoTaskPatentSplit = assoTaskPersonelService.getBaseMapper().getSplitMessage(patentNo, taskId);
+            if (assoTaskPatentSplit != null) {
+                map.put("splitBy", assoTaskPatentSplit.getSplitBy());
+                map.put("splitType", assoTaskPatentSplit.getSplitType());
+            } else {
+                map.put("splitBy", null);
+                map.put("splitType", null);
+            }
+            return map;
+        }else {
+            Map<String, Object> map = new HashMap<>();
+            LambdaQueryWrapper<Report> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(Report::getId,reportId).eq(Report::getSignPatentNo,patentNo);
+            Report report = reportService.list(queryWrapper).get(0);
+            if (report != null) {
+                map.put("splitBy", report.getSplitBy());
+                map.put("splitType", report.getSplitType());
+
+            } else {
+                map.put("splitBy", null);
+                map.put("splitType", null);
+            }
+
+            return map;
+        }
     }
 
 }

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

@@ -49,12 +49,18 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         // 获取登录人信息
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         List<CompareMessage> compareMessages = new ArrayList<>();
+        Features feature=new Features();
         //根据登录人Id,报告Id,标的专利号查询特征
         LambdaQueryWrapper<Features> wrapper = new LambdaQueryWrapper<>();
         if (vos.get(0).getTaskId() != null && vos.get(0).getSignPatentNo() != null) {
             wrapper.eq(Features::getTaskId, vos.get(0).getTaskId())
                     .eq(Features::getSignPatentNo, vos.get(0).getSignPatentNo());
-            Features feature = featureService.list(wrapper).get(0);
+            feature = featureService.list(wrapper).get(0);
+        }if(vos.get(0).getReportId()!=null &&  vos.get(0).getSignPatentNo() != null ){
+            wrapper.eq(Features::getReportId, vos.get(0).getReportId())
+                    .eq(Features::getSignPatentNo, vos.get(0).getSignPatentNo());
+             feature = featureService.list(wrapper).get(0);
+        }
             //根据特征Id删除对比记录
             List<Features> features = featureService.list(wrapper);
             if (features != null && features.size() > 0) {
@@ -70,7 +76,9 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
                 Features features1 = new Features();
                 features1.setContent(vos.get(i).getContent());
                 features1.setFeaturesOrder(order);
-                features1.setTaskId(vos.get(i).getTaskId());
+                if(vos.get(i).getTaskId()!=null) {
+                    features1.setTaskId(vos.get(i).getTaskId());
+                }
                 features1.setSplitType(feature.getSplitType());
                 features1.setSplitBy(feature.getSplitBy());
                 features1.setPartnerId(personnelVO.getId());
@@ -88,11 +96,13 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
                 compareMessage.setTargetDescription(vos.get(i).getTargetDescription());
                 compareMessage.setCompareDescription(vos.get(i).getCompareDescription());
                 compareMessage.setReportId(feature.getReportId());
-                compareMessage.setTaskId(feature.getTaskId());
+                if(feature.getTaskId()!=null) {
+                    compareMessage.setTaskId(feature.getTaskId());
+                }
                 compareMessages.add(compareMessage);
                 order += 1;
             }
-        }
+
         return this.saveBatch(compareMessages);
     }
 
@@ -192,7 +202,7 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
             patentRightVo.setSignPatentNo(patentNo);
             patentRightVos.add(patentRightVo);
         }
-        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(taskId, patentNo);
+        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(taskId, patentNo,reportId);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("patentRightVos", patentRightVos);
         map.put("splitBy", map1.get("splitBy"));
@@ -322,7 +332,7 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
             patentRightVo.setSignPatentNo(patentNo);
             patentRightVos.add(patentRightVo);
         }
-        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(null, patentNo);
+        Map<String, Object> map1 = assoTaskPatentSplitService.getSplitMessage(null, patentNo,reportId);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("patentRightVos", patentRightVos);
         map.put("splitBy", map1.get("splitBy"));

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

@@ -297,5 +297,21 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
 
     }
 
+    /**
+     * 修改报告的状态
+     * @param reportId 报告id
+     * @param status 状态
+     */
+    @Transactional
+    public void updateStatus(Integer reportId,Integer status){
+        LambdaQueryWrapper<Report> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Report::getId, reportId);
+        Report report = this.list(wrapper).get(0);
+        report.setStatus(status);
+        report.updateById();
+
+    }
+
+
 
 }

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

@@ -681,24 +681,48 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
      * @author ：cj
      */
     @Transactional
-    public String read(int taskID, String patentNo) {
-        LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID).eq(AssoTaskPersonel::getPatentNo, patentNo);
-        AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
-        if (assoTaskPersonel.getState().equals(1)) {
-            assoTaskPersonel.setState(0);
-        } else {
-            assoTaskPersonel.setState(1);
+    public String read(Integer taskID, String patentNo,Integer reportId) {
+
+        if(taskID!=null) {
+            LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoTaskPersonel::getPatentNo, patentNo);
+            queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID);
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            if (assoTaskPersonel.getState().equals(1)) {
+                assoTaskPersonel.setState(0);
+            } else {
+                assoTaskPersonel.setState(1);
+            }
+            assoTaskPersonel.updateById();
+        }else {
+            LambdaQueryWrapper<CompareFiles> queryWrapper=new LambdaQueryWrapper<>();
+            queryWrapper.eq(CompareFiles::getReportId,reportId).eq(CompareFiles::getPatentNo,patentNo);
+            CompareFiles compareFiles = compareFilesService.list(queryWrapper).get(0);
+            compareFiles.setState(1);
+            compareFiles.updateById();
+
+
+
         }
-        assoTaskPersonel.updateById();
-        return Response.success();
+            return Response.success();
+
     }
 
-    public String look(int taskID, String patentNo) {
-        LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID).eq(AssoTaskPersonel::getPatentNo, patentNo);
-        AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
-        return Response.success(assoTaskPersonel.getState());
+    public String look( Integer taskID, String patentNo,Integer reoportId) {
+        if (taskID != null) {
+            LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AssoTaskPersonel::getPatentNo, patentNo);
+            queryWrapper.eq(AssoTaskPersonel::getTaskId, taskID);
+            AssoTaskPersonel assoTaskPersonel = assoTaskPersonelService.list(queryWrapper).get(0);
+            return Response.success(assoTaskPersonel.getState());
+        }
+        else {
+            LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(CompareFiles::getPatentNo,patentNo).eq(CompareFiles::getReportId,reoportId);
+            List<CompareFiles> list = compareFilesService.list(queryWrapper);
+            return Response.success(list.get(0).getState());
+
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

RMS/src/main/resources/application-dev.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+    timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver

RMS/src/main/resources/application-docker.yml

@@ -3,7 +3,13 @@ spring:
     host: pas-redis
     port: 6379
     database: 0
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
     password: cslg_docker_123456
   datasource:
     url: jdbc:mysql://pas-mysql:3306/pas?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8

RMS/src/main/resources/application-prod.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 3
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/pas-prod?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root

RMS/src/main/resources/application-test.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver

RMS/target/classes/application-dev.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+    timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver

RMS/target/classes/application-test.yml

@@ -4,7 +4,13 @@ spring:
     port: 6379
     database: 9
     password: Xx0GWxdWQJxx6Swe
-    timeout: 1000
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: -1ms
+      timeout: 2000ms
   datasource:
     url: jdbc:mysql://47.101.137.223:3306/RMS_TEST?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     driver-class-name: com.mysql.cj.jdbc.Driver

RMS/target/classes/application.yml

@@ -43,7 +43,7 @@ spring:
       max-file-size: 1000MB
       max-request-size: 1000MB
   profiles:
-    active: dev
+    active: test
   jackson:
     default-property-inclusion: non_null
     serialization:

RMS/target/classes/mapper/CompareMessageMapper.xml

@@ -24,9 +24,11 @@
         <where>
             and f.REPORT_ID=#{params.reportId}
             and cm.ID is not null
+            <if test="params.patentNo !=null">
+                and f.SIGN_PATENT_NO=#{params.patentNo}
+            </if>
             <if test="params.compareResult !=null">
                 and   cm.COMPARE_RESULT=#{params.compareResult}
-
             </if>
         </where>