Ver Fonte

12chenyi

chenyi há 2 anos atrás
pai
commit
ef15cac747
30 ficheiros alterados com 240 adições e 3844 exclusões
  1. 59 9
      .idea/workspace.xml
  2. 0 53
      RMS/src/main/java/cn/cslg/report/entity/CompareResults.java
  3. 1 1
      RMS/src/main/java/cn/cslg/report/entity/CompareScenarios.java
  4. 0 66
      RMS/src/main/java/cn/cslg/report/entity/asso/AssoCoordinationPartner.java
  5. 12 1
      RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java
  6. 11 0
      RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java
  7. 10 0
      RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java
  8. 3 1
      RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java
  9. 9 0
      RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java
  10. 2 0
      RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java
  11. 10 0
      RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java
  12. 9 1
      RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java
  13. 18 1
      RMS/src/main/java/cn/cslg/report/service/business/ReportService.java
  14. 21 1
      RMS/src/main/java/cn/cslg/report/service/business/TaskService.java
  15. 16 2
      RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCCService.java
  16. 8 0
      RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java
  17. 1 1
      RMS/target/classes/application.yml
  18. BIN
      RMS/target/classes/cn/cslg/report/entity/CompareResults.class
  19. BIN
      RMS/target/classes/cn/cslg/report/entity/CompareScenarios.class
  20. BIN
      RMS/target/classes/cn/cslg/report/entity/asso/AssoCoordinationPartner.class
  21. BIN
      RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class
  22. BIN
      RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class
  23. BIN
      RMS/target/classes/cn/cslg/report/service/business/CompareRecordsService.class
  24. BIN
      RMS/target/classes/cn/cslg/report/service/business/ReportService.class
  25. BIN
      RMS/target/classes/cn/cslg/report/service/business/TaskService.class
  26. 0 791
      logs/rms/rms-info.2022-12-14.0.log
  27. 0 967
      logs/rms/rms-info.2022-12-15.0.log
  28. 0 385
      logs/rms/rms-info.2022-12-16.0.log
  29. 0 1078
      logs/rms/rms-info.2022-12-20.0.log
  30. 50 486
      logs/rms/rms-info.log

+ 59 - 9
.idea/workspace.xml

@@ -4,13 +4,36 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12.20 chenyi">
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2022_12_21_17_18__Default_Changelist_.xml" beforeDir="false" />
+    <list default="true" id="e7cd156b-23fc-410f-9ecc-be34a2e87174" name="Default Changelist" comment="12chenyi">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-docker.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-docker.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application-prod.yml" 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$/RMS/src/main/java/cn/cslg/report/entity/CompareResults.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/CompareScenarios.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/CompareScenarios.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/entity/asso/AssoCoordinationPartner.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.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/CompareRecordsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.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/src/main/java/cn/cslg/report/service/business/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/TaskService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCCService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCCService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/src/main/java/cn/cslg/report/service/business/asso/SyneryCodeService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/application.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareResults.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareScenarios.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/CompareScenarios.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/entity/asso/AssoCoordinationPartner.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.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/CompareRecordsService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/CompareRecordsService.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$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" beforeDir="false" afterPath="$PROJECT_DIR$/RMS/target/classes/cn/cslg/report/service/business/TaskService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.2022-12-14.0.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.2022-12-15.0.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.2022-12-16.0.log" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.2022-12-20.0.log" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/logs/rms/rms-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/rms/rms-info.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -21,8 +44,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Interface" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -79,6 +102,17 @@
     </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" />
@@ -102,6 +136,7 @@
       <workItem from="1673314193726" duration="396000" />
       <workItem from="1673314631144" duration="15878000" />
       <workItem from="1673400625616" duration="625000" />
+      <workItem from="1673486700261" duration="13075000" />
     </task>
     <task id="LOCAL-00001" summary="12.20 陈宇">
       <created>1671533439152</created>
@@ -145,7 +180,21 @@
       <option name="project" value="LOCAL" />
       <updated>1673346654153</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <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>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -166,6 +215,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="12.20 陈宇" />
     <MESSAGE value="12.20 chenyi" />
-    <option name="LAST_COMMIT_MESSAGE" value="12.20 chenyi" />
+    <MESSAGE value="12chenyi" />
+    <option name="LAST_COMMIT_MESSAGE" value="12chenyi" />
   </component>
 </project>

+ 0 - 53
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;
-}

+ 1 - 1
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
      */

+ 0 - 66
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;
-}

+ 12 - 1
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();
+    }
+
 
 
 }

+ 11 - 0
RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java

@@ -438,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();
+
+    }
+
 }

+ 10 - 0
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();
+    }
+
 
 
 }

+ 3 - 1
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;
     }
 

+ 9 - 0
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();
+
+    }
+
 }

+ 2 - 0
RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java

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

+ 10 - 0
RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -540,6 +540,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();
+    }
+
 
 }
 

+ 9 - 1
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();
+  }
 
 
 

+ 18 - 1
RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -55,7 +55,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 沈永艺
@@ -271,9 +276,21 @@ 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) {

+ 21 - 1
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));

+ 16 - 2
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();
+ }
 
 
 

+ 8 - 0
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();
+}
 
 
 }

+ 1 - 1
RMS/target/classes/application.yml

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

BIN
RMS/target/classes/cn/cslg/report/entity/CompareResults.class


BIN
RMS/target/classes/cn/cslg/report/entity/CompareScenarios.class


BIN
RMS/target/classes/cn/cslg/report/entity/asso/AssoCoordinationPartner.class


BIN
RMS/target/classes/cn/cslg/report/service/business/CompareFilesService.class


BIN
RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class


BIN
RMS/target/classes/cn/cslg/report/service/business/CompareRecordsService.class


BIN
RMS/target/classes/cn/cslg/report/service/business/ReportService.class


BIN
RMS/target/classes/cn/cslg/report/service/business/TaskService.class


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 791
logs/rms/rms-info.2022-12-14.0.log


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 967
logs/rms/rms-info.2022-12-15.0.log


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 385
logs/rms/rms-info.2022-12-16.0.log


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 1078
logs/rms/rms-info.2022-12-20.0.log


Diff do ficheiro suprimidas por serem muito extensas
+ 50 - 486
logs/rms/rms-info.log