Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	RMS/src/main/java/cn/cslg/report/service/business/ReportService.java
#	RMS/target/classes/cn/cslg/report/controller/ReportController.class
#	RMS/target/classes/cn/cslg/report/controller/TaskController.class
#	RMS/target/classes/cn/cslg/report/service/business/ReportService.class
#	RMS/target/classes/cn/cslg/report/service/business/TaskService.class

.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml

@@ -1,79 +0,0 @@
-<changelist name="Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]" date="1671614308671" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/shelved.patch" />
-  <option name="DESCRIPTION" value="Uncommitted changes before Update at 2022/12/21 17:18 [Default Changelist]" />
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/7e9c8204c71f4862b0f49b6713271856.jpg" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/7e9c8204c71f4862b0f49b6713271856.jpg" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/b55744b79ef14779b32b4ba7fd6ea0f7.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/b55744b79ef14779b32b4ba7fd6ea0f7.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/14fed836f00f4725a1aaf61f7494c7a6.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/14fed836f00f4725a1aaf61f7494c7a6.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/IProductService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/IProductService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/IProductService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/IAssoProductFileService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/IAssoProductFileService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/244ca18d2d2f447381ed3a8235f57a84.jpg" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/244ca18d2d2f447381ed3a8235f57a84.jpg" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/controller/ProductController.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/controller/ProductController.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductController.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/mapper/AssoProductFileMapper.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/AssoProductFileMapper.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/AssoProductFileServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/AssoProductFileServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/7738d41e149e4addab9a88b2bd6051a8.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/7738d41e149e4addab9a88b2bd6051a8.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/common/model/dto/ProductDTO.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductDTO.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/business/ReportService.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/business/ReportService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ReportService.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/service/impl/ProductServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/ProductServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" />
-    <option name="AFTER_PATH" value="RMS/target/file/20221221/bb7df77ef6d64e8e84e539d24adc25e1.png" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/bb7df77ef6d64e8e84e539d24adc25e1.png" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="RMS/target/classes/cn/cslg/report/entity/Product.class" />
-    <option name="AFTER_PATH" value="RMS/target/classes/cn/cslg/report/entity/Product.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18_[Default_Changelist]/Product.class" />
-  </binary>
-</changelist>

.idea/workspace.xml

@@ -4,23 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12.20 陈宇">
-      <change afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/AddSyneryVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/common/model/vo/CompareMessageVO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/controller/CompareMessageController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/common/model/vo/CompareMessageVO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/CompareMessageController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/controller/ProductController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/ReportService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-debug.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-debug.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
-    </list>
+    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12chenyi" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -29,8 +13,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Interface" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -60,6 +44,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="SONARLINT_PRECOMMIT_ANALYSIS" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report" />
@@ -68,6 +53,7 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="ReactorSettings">
     <option name="notificationShown" value="true" />
@@ -85,17 +71,6 @@
     </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="Application" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="RMS" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="cn.cslg.report.Application" />
@@ -115,6 +90,11 @@
       <workItem from="1671511902044" duration="19866000" />
       <workItem from="1671539384819" duration="6630000" />
       <workItem from="1671585394564" duration="1889000" />
+      <workItem from="1673232805752" duration="20679000" />
+      <workItem from="1673314193726" duration="396000" />
+      <workItem from="1673314631144" duration="15878000" />
+      <workItem from="1673400625616" duration="625000" />
+      <workItem from="1673486700261" duration="13352000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -137,7 +117,49 @@
       <option name="project" value="LOCAL" />
       <updated>1671546004898</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="12.20 chenyi">
+      <created>1673250297145</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1673250297145</updated>
+    </task>
+    <task id="LOCAL-00005" summary="12.20 chenyi">
+      <created>1673258736217</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1673258736217</updated>
+    </task>
+    <task id="LOCAL-00006" summary="12.20 chenyi">
+      <created>1673346654153</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1673346654153</updated>
+    </task>
+    <task id="LOCAL-00007" summary="12chenyi">
+      <created>1673486742941</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1673486742941</updated>
+    </task>
+    <task id="LOCAL-00008" summary="12chenyi">
+      <created>1673486772664</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1673486772664</updated>
+    </task>
+    <task id="LOCAL-00009" summary="12chenyi">
+      <created>1673519516759</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1673519516759</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -157,17 +179,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="12.20 陈宇" />
-    <option name="LAST_COMMIT_MESSAGE" value="12.20 陈宇" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java</url>
-          <line>114</line>
-          <option name="timeStamp" value="18" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
+    <MESSAGE value="12.20 chenyi" />
+    <MESSAGE value="12chenyi" />
+    <option name="LAST_COMMIT_MESSAGE" value="12chenyi" />
   </component>
 </project>

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

@@ -121,6 +121,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/entity/CompareResults.java

@@ -1,53 +0,0 @@
-package cn.cslg.report.entity;
-
-import cn.cslg.report.common.model.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 对比结果表
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "COMPARE_RESULTS")
-public class CompareResults extends BaseEntity<CompareResults> {
-    /**
-     * 报告ID
-     */
-    @TableField(value = "REPORT_ID")
-    private String reportId;
-
-    /**
-     * 特征ID
-     */
-    @TableField(value = "FEATURES_ID")
-    private String featuresId;
-
-    /**
-     * 特征
-     */
-    @TableField(value = "FEATURES")
-    private String features;
-
-    /**
-     * 权要ID
-     */
-    @TableField(value = "RIGHT_ID")
-    private String rightId;
-
-    /**
-     * 权要
-     */
-    @TableField(value = "RIGHT")
-    private String right;
-
-    /**
-     * 对比结果
-     */
-    @TableField(value = "COMPARE_RESULT")
-    private String compareResult;
-}

RMS/src/main/java/cn/cslg/report/entity/CompareScenarios.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "COMPARE_SCENARIOS")
-public class CompareScenarios extends BaseEntity<CompareResults> {
+public class CompareScenarios extends BaseEntity<CompareScenarios> {
     /**
      * 权要ID
      */

RMS/src/main/java/cn/cslg/report/entity/asso/AssoCoordinationPartner.java

@@ -1,66 +0,0 @@
-package cn.cslg.report.entity.asso;
-
-import cn.cslg.report.common.model.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * 协同信息表
- */
-@Data
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "ASSO_COORDINATION_PARTNER")
-public class AssoCoordinationPartner extends BaseEntity<AssoCoordinationPartner> {
-    /**
-     * 协同人ID
-     */
-    @TableField(value = "PARTNER_ID")
-    private String partnerId;
-
-    /**
-     * 抄送人ID
-     */
-    @TableField(value = "CC_ID")
-    private String ccId;
-
-    /**
-     * 发送人ID
-     */
-    @TableField(value = "SENDER_ID")
-    private String senderId;
-
-    /**
-     * 发送时间
-     */
-    @TableField(value = "SENDER_TIME")
-    private String senderTime;
-
-    /**
-     * 状态
-     */
-    // TODO: 2022/11/3 未设定枚举值
-    @TableField(value = "STATUS")
-    private String status;
-
-    /**
-     * 完成时间
-     */
-    @TableField(value = "FINISH_TIME")
-    private String finishTime;
-
-    /**
-     * 开始时间
-     */
-    @TableField(value = "BEGIN_TIME")
-    private String beginTime;
-
-    /**
-     * 任务ID
-     */
-    @TableField(value = "TASK_ID")
-    private String taskId;
-}

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/CompareFilesService.java

@@ -269,7 +269,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
      * @return
      * @throws IOException
      */
-    public String dele(int id)throws IOException{
+    public String deleByReportId(int id)throws IOException{
         CompareFiles compareFiles = new CompareFiles();
         compareFiles.deleteById(id);
         return Response.success();
@@ -361,6 +361,17 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         reMap.put("read", assoRead.size());
         return reMap;
     }
+    /**
+     * function : 在删除报告的时候删除对比文件
+     *
+     */
+    public String delete(Integer id){
+        LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CompareFiles::getReportId,id);
+        remove(queryWrapper);
+        return Response.success();
+    }
+
 
 
 }

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);
     }
 
@@ -184,7 +194,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"));
@@ -314,7 +324,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"));
@@ -428,4 +438,15 @@ List<Integer> Ids =features.stream().map(Features::getId).collect(Collectors.toL
         map.put("right",right);
         return map;
     }
+    /**
+     * funtion:删除报告时删除
+     */
+    public String deleteByFeatureId(List<Integer> list){
+        LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<>();
+        queryWrapper.in(CompareMessage ::getFeatureId,list);
+        remove(queryWrapper);
+        return Response.success();
+
+    }
+
 }

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

@@ -198,6 +198,16 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         return list.get(0);
 
     }
+    /**
+     * funtion: 删除报告时删除
+     */
+    public String deleteByTaskId(Integer id){
+        LambdaQueryWrapper<CompareRecords> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CompareRecords::getTaskId,id);
+        remove(lambdaQueryWrapper);
+        return Response.success();
+    }
+
 
 
 }

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

@@ -532,8 +532,10 @@ List<Map<String,Object>> mapList =new ArrayList<Map<String,Object>>();
     public Integer delByReportId(int reportId) {
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Features::getReportId, reportId);
-        this.remove(queryWrapper);
         List<Features> features = this.list(queryWrapper);
+        List<Integer> collect = features.stream().map(Features::getId).collect(Collectors.toList());
+        compareMessageService.deleteByFeatureId(collect);
+        this.remove(queryWrapper);
         return 1;
     }
 

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

@@ -56,4 +56,13 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         Boolean flag = this.removeById(id);
         return flag;
     }
+    //删除报告时删除导入任务
+    public String deleteByRortID(Integer id){
+        LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ImportTask::getReportId, id);
+        remove(queryWrapper);
+        return Response.success();
+
+    }
+
 }

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

@@ -155,5 +155,7 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
 
     }
 
+
+
 }
 

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

@@ -550,6 +550,16 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         XWPFTemplate template = XWPFTemplate.compile(filePath, configure).render(map);
         return template;
     }
+    /**
+     * function:删除报告时删除
+     */
+    public String deleteByReportId(Integer id){
+        LambdaQueryWrapper<ReportDocument> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ReportDocument::getReportId, id);
+        remove(wrapper);
+        return Response.success();
+    }
+
 
 }
 

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

@@ -196,7 +196,15 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
         return reportReferences.updateById();
     }
 
-
+/**
+ * function :删除报告的时候删除
+ */
+  public String deleteByReportId(Integer id){
+      LambdaQueryWrapper<ReportReferences> wrapper = new LambdaQueryWrapper<>();
+      wrapper.eq(ReportReferences::getReportID,id);
+      remove(wrapper);
+      return Response.success();
+  }
 
 
 

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

@@ -57,7 +57,12 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final FeatureService featureService;
     private final CompareScenariosService compareScenariosService;
     private final IProductService productService;
-
+    private final CompareFilesService compareFilesService;
+    private final CompareMessageService compareMessageService;
+    private final ImportTaskService importTaskService;
+    private final InvalidRecordService invalidRecordService;
+    private  final ReportDocumentService reportDocumentService;
+    private final ReportReferencesService reportReferencesService;
     /**
      * @param report 报告类
      * @author 沈永艺
@@ -273,9 +278,22 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         reportFieldService.deleteByReportId(id);
         //删除所有和报告有关的对比方案
         compareScenariosService.deleteByReportId(id);
+        //删除任务人员关联信息表
         assoTaskPersonelService.deleAssoTaskPersonel(id);
         //陈宇 ↓ 删除和报告有关的产品表数据、删除和产品有关的产品文件关联表数据、删除和产品有关的报告系统文件表数据
         productService.deleteProduct(id);
+        //删除对比文件
+        compareFilesService.delete(id);
+        //导入删除导入任务
+        importTaskService.deleteByRortID(id);
+
+        //删除报告文件导出
+        reportDocumentService.deleteByReportId(id);
+        //删除报告参考资料
+        reportReferencesService.deleteByReportId(id);
+
+
+
         Boolean dele =this.removeById(id);
         if (dele ==true) {
             return Response.success();
@@ -298,5 +316,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

@@ -16,6 +16,7 @@ import cn.cslg.report.entity.asso.Synery_CC;
 import cn.cslg.report.mapper.TaskMapper;
 import cn.cslg.report.service.OutInterfaceService;
 import cn.cslg.report.service.business.asso.SyneryCCService;
+import cn.cslg.report.service.business.asso.SyneryCodeService;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -58,8 +59,10 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
     private final MessageUtils mailUtils;
     private final LoginUtils loginUtils;
     private final SyneryCCService syneryCCService;
-
+    private final CompareRecordsService compareRecordsService;
     private final CompareMessageService compareMessageService;
+    private final SyneryCodeService syneryCodeService;
+
 
     /**
      * @param id(Task 任务id)
@@ -91,6 +94,23 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         try {
             LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Task::getReportId, id);
+            //拿到对象，根据对象判断任务类型
+            List<Task> list = this.list(queryWrapper);
+            if(list.size()!=0){
+               for(Task task : list){
+                   if(task.getType().equals(1)){
+                       syneryCCService.deleteByTaskId(task.getId());
+                       syneryCodeService.deleteByTaskId(task.getId());
+
+                   }
+                   if(task.getType().equals(2)){
+                       //删除对比记录
+                       compareRecordsService.deleteByTaskId(task.getId());
+
+                   }
+               }
+            }
+
             return this.remove(queryWrapper);
         } catch (Exception e) {
             log.error("删除任务异常,异常信息:" + LogExceptionUtil.getMessage(e));
@@ -692,24 +712,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/java/cn/cslg/report/service/business/asso/SyneryCCService.java

@@ -1,21 +1,35 @@
 package cn.cslg.report.service.business.asso;
 
-import cn.cslg.report.entity.AssoComapareFiel;
+
+import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.asso.Synery_CC;
-import cn.cslg.report.mapper.AssoComapareFielMapper;
+
 import cn.cslg.report.mapper.SyneryCCMapper;
+import com.baomidou.mybatisplus.core.conditions.AbstractWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @SuppressWarnings({"all"})
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SyneryCCService extends ServiceImpl<SyneryCCMapper, Synery_CC> {
+    /**
+     * functio : 协同任务删除时
+     */
 
+ public String deleteByTaskId(Integer taskId){
+     LambdaQueryWrapper<Synery_CC> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+     lambdaQueryWrapper.eq(Synery_CC::getTaskId,taskId);
+     remove(lambdaQueryWrapper);
+     return Response.success();
+ }
 
 
 

RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java

@@ -1,9 +1,11 @@
 package cn.cslg.report.service.business.asso;
 
+import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.asso.SyneryCode;
 import cn.cslg.report.entity.asso.Synery_CC;
 import cn.cslg.report.mapper.SyneryCCMapper;
 import cn.cslg.report.mapper.SyneryCodeMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +18,12 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class SyneryCodeService extends ServiceImpl<SyneryCodeMapper, SyneryCode> {
 
+public String deleteByTaskId(Integer taskId){
+    LambdaQueryWrapper<SyneryCode> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+    lambdaQueryWrapper.eq(SyneryCode::getTaskId,taskId);
+    remove(lambdaQueryWrapper);
+    return Response.success();
+}
 
 
 }

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-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/target/classes/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/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