Merge remote-tracking branch 'origin/master'

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

@@ -24,12 +24,12 @@ public class AssoTaskPersonelController {
     /*
     根据报告表中的id删除任务人员关联表的数据
      */
-    @RequestMapping(value = "/deleAssoTaskPersonel", method = RequestMethod.GET)
-    @Operation(summary = "删除人员关系")
-    public String deleAssoTaskPersonel(Integer id)throws IOException{
-
-        return assoTaskPersonelService.deleAssoTaskPersonel(id);
-    }
+//    @RequestMapping(value = "/deleAssoTaskPersonel", method = RequestMethod.GET)
+//    @Operation(summary = "删除人员关系")
+//    public String deleAssoTaskPersonel(Integer id)throws IOException{
+//
+//        return assoTaskPersonelService.deleAssoTaskPersonel(id);
+//    }
 
 
 }

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

@@ -5,6 +5,7 @@ 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.entity.Report;
+import cn.cslg.report.service.business.AssoTaskPersonelService;
 import cn.cslg.report.service.business.CompareFilesService;
 import cn.cslg.report.service.business.ReportService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -24,7 +25,7 @@ import java.io.IOException;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ReportController {
     private final ReportService reportService;
-
+   private final AssoTaskPersonelService assoTaskPersonelService;
 
     /**
      * @param report 报告类
@@ -79,6 +80,7 @@ public class ReportController {
     @RequestMapping(value = "/deleReport", method = RequestMethod.GET)
     @Operation(summary = "删除报告")
     public String deleReport(Integer id)throws IOException {
+        assoTaskPersonelService.deleAssoTaskPersonel(id);
         return reportService.reportDele(id);
     }
 

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

@@ -10,4 +10,5 @@ import java.util.List;
 
 @Mapper
 public interface CompareFilesMapper extends BaseMapper<CompareFiles> {
+    int selectedTotal(@Param("id") int id);
 }

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

@@ -3,7 +3,9 @@ package cn.cslg.report.mapper;
 import cn.cslg.report.entity.Report;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface ReportMapper extends BaseMapper<Report> {
+    int dele(@Param("id") Integer id);
 }

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

@@ -13,6 +13,7 @@ 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 lombok.val;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +29,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class CompareFilesService extends ServiceImpl<CompareFilesMapper, CompareFiles> {
+    private final CompareFilesMapper compareFilesMapper;
       private final OutInterfaceService outInterfaceService;
 //    public String addCompareFile(CompareFilesVO compareFilesVO){
 //     List<CompareFiles> compareFiles =new ArrayList<>();
@@ -51,8 +53,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         patentVO.setStartNumber(compareFilesVO.getStartNumber()-1);
         patentVO.setEndNumber(compareFilesVO.getEndNumber());
         patentVO.setReportId(compareFilesVO.getReportId());
-        patentVO.setPatentNos(patentNoList);
-     String res = outInterfaceService.getComPatentNos(patentVO);
+        patentVO.setPatentNos(patentNoList);String res = outInterfaceService.getComPatentNos(patentVO);
        JSONObject jsonObject =JSONObject.parseObject(res);
        List<String> patentNos =JSONArray.parseArray(jsonObject.get("data").toString(),String.class);
        patentNos.removeAll(compareFilesVO.getIsDelete());
@@ -77,7 +78,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         patentVO.setPatentNos(patentNos);
         String res =outInterfaceService.getPatentFromPAS(patentVO,0);
         JSONObject jsonObject = JSONObject.parseObject(res);
-       JSONObject resData = JSONObject.parseObject(jsonObject.getString("data"));
+        JSONObject resData = JSONObject.parseObject(jsonObject.getString("data"));
        List<JSONObject>     list=   JSONArray.parseArray(resData.getString("records"),JSONObject.class);
         List<String> temNos =new ArrayList<>();
    for(int i=0;i<list.size(); i++){
@@ -85,9 +86,11 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
        temNos.add(list.get(i).get("patentNo").toString());}
 
    }
-    Map<String,Object> map =new HashMap<>();
-   map.put("datas",resData);
+    int i = compareFilesMapper.selectedTotal(patentVO.getReportId());
+        Map<String,Object> map =new HashMap<>();
+           map.put("datas",resData);
            map.put("select",temNos);
+           map.put("selectedTotal",i);
         return Response.success(map) ;
     }
 

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

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final OutInterfaceService outInterfaceService;
+    private final ReportMapper reportMapper;
 
     /**
      * @param report 报告类
@@ -119,9 +121,18 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
 
         return reports;
     }
+//    public String reportDele(int id) throws IOException{
+//        this.removeById(id);
+//        return Response.success();
+//    }
     public String reportDele(int id) throws IOException{
-        this.removeById(id);
-        return Response.success();
+       int  dele  = reportMapper.dele(id);
+        if(dele>0){
+            return Response.success();
+        }
+        return   Response.error("没有数据");
+
     }
 
+
 }

RMS/src/main/resources/application.yml

@@ -67,6 +67,6 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-PCSUrl: http://localhost:8880
-PASUrl: http://localhost:8879
+PCSUrl: http://192.168.1.4:8880
+PASUrl: http://192.168.1.4:8879
 

RMS/src/main/resources/mapper/CompareFilesMapper.xml

@@ -22,4 +22,7 @@
         </where>
         order by a.ctime ${params.order}
     </select>
+    <select id="selectedTotal" resultType="int">
+        select  count(*) from COMPARE_FILES where REPORT_ID=#{id}
+    </select>
 </mapper>

RMS/src/main/resources/mapper/Report.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.cslg.report.mapper.ReportMapper">
+  <delete id="dele">
+    delete from REPORT where ID=#{id}
+  </delete>
+
+</mapper>

logs/rms/rms-debug.2022-11-16.0.log

@@ -0,0 +1,36 @@
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:29:55.017 DEBUG 2796 [http-nio-8885-exec-5] cn.cslg.report.mapper.CompareFilesMapper.selectList ==>  Preparing: SELECT ID,REPORT_ID,PATENT_NO,REMARK FROM COMPARE_FILES WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:29:55.041 DEBUG 2796 [http-nio-8885-exec-5] cn.cslg.report.mapper.CompareFilesMapper.selectList ==> Parameters: 1(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:29:55.074 DEBUG 2796 [http-nio-8885-exec-5] cn.cslg.report.mapper.CompareFilesMapper.selectList <==      Total: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:30:48.819 DEBUG 2796 [http-nio-8885-exec-8] cn.cslg.report.mapper.ReportMapper.deleteById ==>  Preparing: DELETE FROM REPORT WHERE ID=?
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:30:48.820 DEBUG 2796 [http-nio-8885-exec-8] cn.cslg.report.mapper.ReportMapper.deleteById ==> Parameters: 1(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:30:48.851 DEBUG 2796 [http-nio-8885-exec-8] cn.cslg.report.mapper.ReportMapper.deleteById <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:51:46.870 DEBUG 7552 [http-nio-8885-exec-8] cn.cslg.report.mapper.ReportMapper.deleteById ==>  Preparing: DELETE FROM REPORT WHERE ID=?
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:51:46.900 DEBUG 7552 [http-nio-8885-exec-8] cn.cslg.report.mapper.ReportMapper.deleteById ==> Parameters: 1(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 10:51:46.937 DEBUG 7552 [http-nio-8885-exec-8] cn.cslg.report.mapper.ReportMapper.deleteById <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:36:31.958 DEBUG 11236 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==>  Preparing: DELETE FROM ASSO_TASK_PERSONEL WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:36:32.223 DEBUG 11236 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==> Parameters: 48(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:36:32.266 DEBUG 11236 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:37:20.342 DEBUG 11236 [http-nio-8885-exec-7] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==>  Preparing: DELETE FROM ASSO_TASK_PERSONEL WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:37:20.342 DEBUG 11236 [http-nio-8885-exec-7] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==> Parameters: 48(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:37:20.378 DEBUG 11236 [http-nio-8885-exec-7] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:37:37.112 DEBUG 2640 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==>  Preparing: DELETE FROM ASSO_TASK_PERSONEL WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:37:37.139 DEBUG 2640 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==> Parameters: 48(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 11:37:37.175 DEBUG 2640 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 12:38:26.653 DEBUG 2640 [http-nio-8885-exec-8] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==>  Preparing: DELETE FROM ASSO_TASK_PERSONEL WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 12:38:26.654 DEBUG 2640 [http-nio-8885-exec-8] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==> Parameters: 48(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 12:38:26.685 DEBUG 2640 [http-nio-8885-exec-8] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 13:38:18.565 DEBUG 2640 [http-nio-8885-exec-3] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==>  Preparing: DELETE FROM ASSO_TASK_PERSONEL WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 13:38:18.565 DEBUG 2640 [http-nio-8885-exec-3] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==> Parameters: 48(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 13:38:18.602 DEBUG 2640 [http-nio-8885-exec-3] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 13:38:28.222 DEBUG 2640 [http-nio-8885-exec-4] cn.cslg.report.mapper.ReportMapper.deleteById ==>  Preparing: DELETE FROM REPORT WHERE ID=?
+[rms:0.0.0.0:8885] [,] 2022-11-16 13:38:28.223 DEBUG 2640 [http-nio-8885-exec-4] cn.cslg.report.mapper.ReportMapper.deleteById ==> Parameters: 1(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 13:38:28.259 DEBUG 2640 [http-nio-8885-exec-4] cn.cslg.report.mapper.ReportMapper.deleteById <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 16:05:19.626 DEBUG 13120 [http-nio-8885-exec-7] cn.cslg.report.mapper.ReportMapper.dele ==>  Preparing: delete from REPORT where ID=?
+[rms:0.0.0.0:8885] [,] 2022-11-16 16:05:19.648 DEBUG 13120 [http-nio-8885-exec-7] cn.cslg.report.mapper.ReportMapper.dele ==> Parameters: 48(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 16:05:19.687 DEBUG 13120 [http-nio-8885-exec-7] cn.cslg.report.mapper.ReportMapper.dele <==    Updates: 1
+[rms:0.0.0.0:8885] [,] 2022-11-16 17:02:26.221 DEBUG 9428 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==>  Preparing: DELETE FROM ASSO_TASK_PERSONEL WHERE (REPORT_ID = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-16 17:02:26.245 DEBUG 9428 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete ==> Parameters: 1(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 17:02:26.282 DEBUG 9428 [http-nio-8885-exec-4] cn.cslg.report.mapper.AssoTaskPersonelMapper.delete <==    Updates: 0
+[rms:0.0.0.0:8885] [,] 2022-11-16 17:02:26.296 DEBUG 9428 [http-nio-8885-exec-4] cn.cslg.report.mapper.ReportMapper.dele ==>  Preparing: delete from REPORT where ID=?
+[rms:0.0.0.0:8885] [,] 2022-11-16 17:02:26.296 DEBUG 9428 [http-nio-8885-exec-4] cn.cslg.report.mapper.ReportMapper.dele ==> Parameters: 1(Integer)
+[rms:0.0.0.0:8885] [,] 2022-11-16 17:02:26.332 DEBUG 9428 [http-nio-8885-exec-4] cn.cslg.report.mapper.ReportMapper.dele <==    Updates: 0