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

# Conflicts:
#	RMS/target/classes/cn/cslg/report/service/business/CompareMessageService.class
#	RMS/target/classes/cn/cslg/report/service/business/FeatureService.class
#	RMS/target/classes/cn/cslg/report/service/business/ReportService.class

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

@@ -5,6 +5,7 @@ import cn.cslg.report.common.model.vo.FileVO;
 import cn.cslg.report.common.model.vo.ReportVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.StringUtils;
+import cn.cslg.report.common.utils.auth.checkAuth;
 import cn.cslg.report.entity.InvalidRecord;
 import cn.cslg.report.entity.LitigationHistory;
 import cn.cslg.report.entity.Report;
@@ -41,6 +42,7 @@ public class ReportController {
      */
     @RequestMapping(value = "/addReport", method = RequestMethod.POST)
     @Operation(summary = "新增报告")
+    @checkAuth(FunId = "/pcs/report/add")
     @Transactional(rollbackFor = Exception.class)
     public String addReport(Report report, List<MultipartFile> files) {
         // TODO: 2022/11/4 关于错误提示与对应的错误码还需要制定 避免前台看到失败字样 用网络异常来代替说明

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

@@ -5,6 +5,7 @@ import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.dto.TaskTDO;
 import cn.cslg.report.common.model.vo.*;
 import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.auth.checkAuth;
 import cn.cslg.report.entity.*;
 import cn.cslg.report.service.BaseService;
 import cn.cslg.report.service.business.*;
@@ -26,9 +27,7 @@ import java.util.*;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/task")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
-
 public class TaskController {
-
     private final TaskService taskService;
     private final BaseService baseService;
     private final ImportTaskService importTaskService;
@@ -59,6 +58,7 @@ public class TaskController {
 
     @RequestMapping(value = "/addTask", method = RequestMethod.POST)
     @Operation(summary = "新增审核任务")
+    @checkAuth(FunId = "/pcs/report/add")
     public String addTask( String taskVO,List<MultipartFile> files) throws ParseException, IOException {
         return taskService.addTask(taskVO,files);
     }

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

@@ -35,8 +35,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 @SuppressWarnings({"all"})
 public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper, AssoTaskPersonel> {
-   public final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
-   public final OutInterfaceService outInterfaceService;
+   private final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
+   private final OutInterfaceService outInterfaceService;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
     @Value("${PCSUrl}")
     private String PCSUrl;

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

@@ -441,9 +441,9 @@ List<Integer> Ids =features.stream().map(Features::getId).collect(Collectors.toL
     /**
      * funtion:删除报告时删除
      */
-    public String deleteByFeatureId(List<Integer> list){
+    public String deleteByreportID(Integer repotID){
         LambdaQueryWrapper<CompareMessage> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.in(CompareMessage ::getFeatureId,list);
+        queryWrapper.eq(CompareMessage::getReportId,repotID);
         remove(queryWrapper);
         return Response.success();
 

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

@@ -532,9 +532,6 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
     public Integer delByReportId(int reportId) {
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Features::getReportId, reportId);
-        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/ReportService.java

@@ -6,6 +6,7 @@ import cn.cslg.report.common.model.vo.ReportVO;
 import cn.cslg.report.common.model.vo.SystemDictVO;
 import cn.cslg.report.common.utils.*;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.report.common.utils.auth.checkAuth;
 import cn.cslg.report.entity.Personnel;
 import cn.cslg.report.entity.Report;
 
@@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -289,6 +291,8 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         reportDocumentService.deleteByReportId(id);
         //删除报告参考资料
         reportReferencesService.deleteByReportId(id);
+       //删除对比信息
+        compareMessageService.deleteByreportID(id);