chenyi 2 rokov pred
rodič
commit
78a260dc77
68 zmenil súbory, kde vykonal 4597 pridanie a 232 odobranie
  1. 1 0
      RMS/src/main/java/cn/cslg/report/controller/AssoTaskPersonelController.java
  2. 1 0
      RMS/src/main/java/cn/cslg/report/controller/BaseController.java
  3. 2 3
      RMS/src/main/java/cn/cslg/report/controller/CompareController.java
  4. 5 6
      RMS/src/main/java/cn/cslg/report/controller/CompareFilesController.java
  5. 2 3
      RMS/src/main/java/cn/cslg/report/controller/CompareRecordsController.java
  6. 1 1
      RMS/src/main/java/cn/cslg/report/controller/CompareScenariosController.java
  7. 1 2
      RMS/src/main/java/cn/cslg/report/controller/DownloadController.java
  8. 2 3
      RMS/src/main/java/cn/cslg/report/controller/FeatureController.java
  9. 3 4
      RMS/src/main/java/cn/cslg/report/controller/InvalidRecordController.java
  10. 2 1
      RMS/src/main/java/cn/cslg/report/controller/LitigationHistoryController.java
  11. 1 0
      RMS/src/main/java/cn/cslg/report/controller/PatentFiledController.java
  12. 1 0
      RMS/src/main/java/cn/cslg/report/controller/ReferencesController.java
  13. 1 0
      RMS/src/main/java/cn/cslg/report/controller/ReportController.java
  14. 1 0
      RMS/src/main/java/cn/cslg/report/controller/ReportDocumentController.java
  15. 3 3
      RMS/src/main/java/cn/cslg/report/controller/ReportFileController.java
  16. 3 3
      RMS/src/main/java/cn/cslg/report/controller/ReviewHistoryController.java
  17. 1 24
      RMS/src/main/java/cn/cslg/report/controller/TaskController.java
  18. 1 0
      RMS/src/main/java/cn/cslg/report/controller/TempleController.java
  19. 3 2
      RMS/src/main/java/cn/cslg/report/entity/asso/AssoReportReferences.java
  20. 1 1
      RMS/src/main/java/cn/cslg/report/entity/asso/AssoTaskPersonel.java
  21. 1 1
      RMS/src/main/java/cn/cslg/report/mapper/AssoComapareFielMapper.java
  22. 1 1
      RMS/src/main/java/cn/cslg/report/mapper/AssoInvalidRecordFileMapper.java
  23. 1 3
      RMS/src/main/java/cn/cslg/report/mapper/AssoRecordsFeatureMapper.java
  24. 2 2
      RMS/src/main/java/cn/cslg/report/mapper/CompareFilesMapper.java
  25. 2 2
      RMS/src/main/java/cn/cslg/report/mapper/CompareRecordsMapper.java
  26. 1 0
      RMS/src/main/java/cn/cslg/report/mapper/FeatureMapper.java
  27. 2 1
      RMS/src/main/java/cn/cslg/report/mapper/ImportTaskMapper.java
  28. 1 3
      RMS/src/main/java/cn/cslg/report/mapper/InvalidRecordMapper.java
  29. 1 3
      RMS/src/main/java/cn/cslg/report/mapper/LitigationHistoryMapper.java
  30. 1 3
      RMS/src/main/java/cn/cslg/report/mapper/ReferencesMapper.java
  31. 1 1
      RMS/src/main/java/cn/cslg/report/mapper/ReportDocumentMapper.java
  32. 2 1
      RMS/src/main/java/cn/cslg/report/mapper/ReportFieldMapper.java
  33. 0 2
      RMS/src/main/java/cn/cslg/report/mapper/ReportFieldTextMapper.java
  34. 1 4
      RMS/src/main/java/cn/cslg/report/mapper/ReviewHistoryMapper.java
  35. 19 1
      RMS/src/main/java/cn/cslg/report/service/business/AssoComapareFielService.java
  36. 8 3
      RMS/src/main/java/cn/cslg/report/service/business/AssoInvalidRecordFileService.java
  37. 8 3
      RMS/src/main/java/cn/cslg/report/service/business/AssoLitigationHisFileService.java
  38. 4 15
      RMS/src/main/java/cn/cslg/report/service/business/AssoRecordsFeatureService.java
  39. 8 3
      RMS/src/main/java/cn/cslg/report/service/business/AssoReferenceFileService.java
  40. 23 23
      RMS/src/main/java/cn/cslg/report/service/business/AssoReportFileService.java
  41. 15 2
      RMS/src/main/java/cn/cslg/report/service/business/AssoReportReferencesService.java
  42. 9 4
      RMS/src/main/java/cn/cslg/report/service/business/AssoReviewHisFileService.java
  43. 8 2
      RMS/src/main/java/cn/cslg/report/service/business/AssoScenarIOSService.java
  44. 28 11
      RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java
  45. 37 26
      RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java
  46. 28 0
      RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java
  47. 7 3
      RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosAndRecordsService.java
  48. 23 3
      RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosService.java
  49. 8 0
      RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java
  50. 1 1
      RMS/src/main/java/cn/cslg/report/service/business/ImportTaskService.java
  51. 1 3
      RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java
  52. 4 3
      RMS/src/main/java/cn/cslg/report/service/business/LitigationHistoryService.java
  53. 4 4
      RMS/src/main/java/cn/cslg/report/service/business/ReferencesService.java
  54. 2 1
      RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java
  55. 2 1
      RMS/src/main/java/cn/cslg/report/service/business/ReportFieldOptionService.java
  56. 14 0
      RMS/src/main/java/cn/cslg/report/service/business/ReportFieldPatentLinkService.java
  57. 1 3
      RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java
  58. 1 0
      RMS/src/main/java/cn/cslg/report/service/business/ReportFieldTextService.java
  59. 1 0
      RMS/src/main/java/cn/cslg/report/service/business/ReportFieldTreeService.java
  60. 7 7
      RMS/src/main/java/cn/cslg/report/service/business/ReportFileService.java
  61. 48 15
      RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java
  62. 3 2
      RMS/src/main/java/cn/cslg/report/service/business/ReportService.java
  63. 3 2
      RMS/src/main/java/cn/cslg/report/service/business/ReviewHistoryService.java
  64. 1 0
      RMS/src/main/java/cn/cslg/report/service/business/SysDictItemService.java
  65. 3 2
      RMS/src/main/java/cn/cslg/report/service/business/SystemDictItemService.java
  66. 3 2
      RMS/src/main/java/cn/cslg/report/service/business/TaskService.java
  67. 3 4
      RMS/src/main/java/cn/cslg/report/service/business/TemplateService.java
  68. 4209 0
      logs/rms/rms-debug.2022-12-07.1.log

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/AssoTaskPersonelController.java

@@ -16,6 +16,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/AssoTaskPersonel")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class AssoTaskPersonelController {
     public final AssoTaskPersonelService assoTaskPersonelService;
     private final LoginUtils loginUtils;

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/BaseController.java

@@ -29,6 +29,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(Constants.REPORT_API)
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class BaseController {
     private final BaseService baseService;
     private final SystemDictItemService systemDictItemService;

+ 2 - 3
RMS/src/main/java/cn/cslg/report/controller/CompareController.java

@@ -5,8 +5,6 @@ import cn.cslg.report.common.model.vo.PatentVO;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.service.business.CompareFilesService;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
@@ -16,13 +14,14 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import java.io.IOException;
 import java.text.ParseException;
-import java.util.List;
 
 
+@SuppressWarnings({"all"})
 @Tag(name = "对比专利管理")
 @RestController
 @RequestMapping(Constants.REPORT_API + "/compare")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+
 public class CompareController {
     private final CompareFilesService compareFilesService;
 

+ 5 - 6
RMS/src/main/java/cn/cslg/report/controller/CompareFilesController.java

@@ -1,15 +1,14 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.dto.PatentQueryFieldSourceDTO;
-import cn.cslg.report.common.model.vo.CompareFileVO;
+
 import cn.cslg.report.common.model.vo.PatentIndexSettingVO;
-import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
+
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.CompareFiles;
+
 import cn.cslg.report.service.business.CompareFilesService;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -17,7 +16,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
-import java.util.List;
+
 
 
 @Tag(name = "初选")

+ 2 - 3
RMS/src/main/java/cn/cslg/report/controller/CompareRecordsController.java

@@ -1,9 +1,7 @@
 package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.vo.CompareRecordsVO;
-import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
+
 import cn.cslg.report.entity.CompareRecords;
 import cn.cslg.report.service.business.CompareRecordsService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -19,6 +17,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/CompareRecords")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class CompareRecordsController {
     private final CompareRecordsService compareRecordsService;
 

+ 1 - 1
RMS/src/main/java/cn/cslg/report/controller/CompareScenariosController.java

@@ -3,7 +3,7 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.vo.CompareScenariosVO;
 import cn.cslg.report.service.business.CompareScenariosService;
-import com.baomidou.mybatisplus.annotation.TableField;
+
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;

+ 1 - 2
RMS/src/main/java/cn/cslg/report/controller/DownloadController.java

@@ -3,8 +3,7 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.DateUtils;
 import cn.cslg.report.common.utils.FileUtils;
-import cn.cslg.report.entity.Template;
-import cn.cslg.report.service.business.TemplateService;
+
 import cn.hutool.core.io.FileUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;

+ 2 - 3
RMS/src/main/java/cn/cslg/report/controller/FeatureController.java

@@ -3,9 +3,7 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.vo.PatentRightVo;
 import cn.cslg.report.common.model.vo.PatentVO;
-import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.Features;
-import cn.cslg.report.entity.Report;
+
 import cn.cslg.report.service.business.FeatureService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -25,6 +23,7 @@ import java.util.List;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/feature")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class FeatureController {
     private final FeatureService featureService;
 

+ 3 - 4
RMS/src/main/java/cn/cslg/report/controller/InvalidRecordController.java

@@ -3,10 +3,9 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.InvalidRecord;
-import cn.cslg.report.entity.LitigationHistory;
-import cn.cslg.report.entity.Report;
+
 import cn.cslg.report.service.business.InvalidRecordService;
-import cn.cslg.report.service.business.ReportFileService;
+
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
-
+@SuppressWarnings({"all"})
 @Tag(name = "无效记录")
 @RestController
 @RequestMapping(Constants.REPORT_API + "/InvalidRecord")

+ 2 - 1
RMS/src/main/java/cn/cslg/report/controller/LitigationHistoryController.java

@@ -3,7 +3,7 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.LitigationHistory;
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.service.business.LitigationHistoryService;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
@@ -21,6 +21,7 @@ import java.util.List;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/LitigationHistory")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class LitigationHistoryController {
     public final LitigationHistoryService litigationHistoryService;
     @GetMapping(value = "/deleteLitigationHistory")

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/PatentFiledController.java

@@ -21,6 +21,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/patentField")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class PatentFiledController {
     private final ReportFieldService reportFieldService;
     private final ReportFieldTreeService reportFieldTreeService;

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/ReferencesController.java

@@ -21,6 +21,7 @@ import java.util.List;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/References")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReferencesController {
     public final ReferencesService referencesService;
     @RequestMapping(value = "/addReferences", method = RequestMethod.POST)

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/ReportController.java

@@ -27,6 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/report")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportController {
     private final ReportService reportService;
     private final ReportReferencesService reportReferencesService;

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/ReportDocumentController.java

@@ -20,6 +20,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/reportDocument")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportDocumentController {
     public final ReportDocumentService reportDocumentService;
     @RequestMapping(value = "/exportReport", method = RequestMethod.GET)

+ 3 - 3
RMS/src/main/java/cn/cslg/report/controller/ReportFileController.java

@@ -3,20 +3,20 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.ReportFiles;
-import cn.cslg.report.entity.Template;
+
 import cn.cslg.report.service.business.TemplateService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.web.bind.annotation.RequestBody;
+
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-
+@SuppressWarnings({"all"})
 @Tag(name = "文件")
 @RestController
 @RequestMapping(Constants.REPORT_API + "/reportFile")

+ 3 - 3
RMS/src/main/java/cn/cslg/report/controller/ReviewHistoryController.java

@@ -2,9 +2,9 @@ package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.InvalidRecord;
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.service.business.ReviewHistoryService;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
@@ -17,7 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
-
+@SuppressWarnings({"all"})
 @Tag(name = "审查历史")
 @RestController
 @RequestMapping(Constants.REPORT_API + "/reviewHistory")

+ 1 - 24
RMS/src/main/java/cn/cslg/report/controller/TaskController.java

@@ -2,47 +2,24 @@ package cn.cslg.report.controller;
 
 
 import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.*;
-import cn.cslg.report.common.model.delete.PatentList;
-import cn.cslg.report.common.model.delete.Patents;
 import cn.cslg.report.common.model.vo.*;
-import cn.cslg.report.common.utils.DataUtils;
-import cn.cslg.report.common.utils.DateUtils;
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.common.utils.StringUtils;
 import cn.cslg.report.entity.*;
-import cn.cslg.report.entity.asso.AssoRecordsFeature;
 import cn.cslg.report.service.BaseService;
-import cn.cslg.report.service.OutInterfaceService;
 import cn.cslg.report.service.business.*;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.deepoove.poi.XWPFTemplate;
-import com.deepoove.poi.config.Configure;
-import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
-import org.apache.poi.hssf.record.Record;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
+
 
 @Tag(name = "任务管理")
 @RestController

+ 1 - 0
RMS/src/main/java/cn/cslg/report/controller/TempleController.java

@@ -16,6 +16,7 @@ import java.io.IOException;
 @RestController
 @RequestMapping(Constants.REPORT_API + "/template")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class TempleController {
     public final TemplateService templateService;
     @RequestMapping(value = "/getTemplateByType", method = RequestMethod.POST)

+ 3 - 2
RMS/src/main/java/cn/cslg/report/entity/asso/AssoReportReferences.java

@@ -1,7 +1,7 @@
 package cn.cslg.report.entity.asso;
 
 import cn.cslg.report.common.model.BaseEntity;
-import cn.cslg.report.entity.ReportReferences;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -13,12 +13,13 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "ASSO_REPORT_REFERENCES")
+@SuppressWarnings({"all"})
 public class AssoReportReferences extends BaseEntity<AssoReportReferences> {
     @Schema(description = "文件id")
     @TableField(value = " FILE_ID")
     private Integer fileID;
 
-    @Schema(description = "ReportReferences的id")
+    @Schema(description = "报告参考资料id")
     @TableField(value = " REPORT_REFERENCES_ID")
     private  Integer ReportReferencesID;
 }

+ 1 - 1
RMS/src/main/java/cn/cslg/report/entity/asso/AssoTaskPersonel.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
- * 对比方案与对比记录关联表
+ * 任务人员关联表
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
RMS/src/main/java/cn/cslg/report/mapper/AssoComapareFielMapper.java

@@ -1,7 +1,7 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.AssoComapareFiel;
-import cn.cslg.report.entity.CompareFiles;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 1 - 1
RMS/src/main/java/cn/cslg/report/mapper/AssoInvalidRecordFileMapper.java

@@ -2,7 +2,7 @@ package cn.cslg.report.mapper;
 
 
 import cn.cslg.report.entity.asso.AssoInvalidRecordFile;
-import cn.cslg.report.entity.asso.AssoReportFile;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 1 - 3
RMS/src/main/java/cn/cslg/report/mapper/AssoRecordsFeatureMapper.java

@@ -1,12 +1,10 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.asso.AssoRecordsFeature;
-import cn.cslg.report.entity.asso.AssoTaskPersonel;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 
 @Mapper
 public interface AssoRecordsFeatureMapper extends BaseMapper<AssoRecordsFeature> {

+ 2 - 2
RMS/src/main/java/cn/cslg/report/mapper/CompareFilesMapper.java

@@ -1,8 +1,8 @@
 package cn.cslg.report.mapper;
 
-import cn.cslg.report.common.model.vo.CompareFilesVO;
+
 import cn.cslg.report.entity.CompareFiles;
-import cn.cslg.report.entity.Features;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+ 2 - 2
RMS/src/main/java/cn/cslg/report/mapper/CompareRecordsMapper.java

@@ -1,8 +1,8 @@
 package cn.cslg.report.mapper;
 
-import cn.cslg.report.common.model.vo.CompareRecordsVO;
+
 import cn.cslg.report.entity.CompareRecords;
-import cn.cslg.report.entity.asso.AssoTaskPersonel;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+ 1 - 0
RMS/src/main/java/cn/cslg/report/mapper/FeatureMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
+@SuppressWarnings({"all"})
 public interface FeatureMapper extends BaseMapper<Features> {
     public List<String> getSignPatentNo(@Param("contents") List<String> contents);
     Features find(@Param("id") int id);

+ 2 - 1
RMS/src/main/java/cn/cslg/report/mapper/ImportTaskMapper.java

@@ -1,10 +1,11 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.ImportTask;
-import cn.cslg.report.entity.Task;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
+@SuppressWarnings({"all"})
 public interface ImportTaskMapper extends BaseMapper<ImportTask> {
 }

+ 1 - 3
RMS/src/main/java/cn/cslg/report/mapper/InvalidRecordMapper.java

@@ -1,14 +1,12 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.InvalidRecord;
-import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 @Mapper
+@SuppressWarnings({"all"})
 public interface InvalidRecordMapper extends BaseMapper<InvalidRecord> {
     int deleteInvalidRecord(@Param("id") int id);
     int updateInvalidRecord(InvalidRecord invalidRecord);

+ 1 - 3
RMS/src/main/java/cn/cslg/report/mapper/LitigationHistoryMapper.java

@@ -1,12 +1,10 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.LitigationHistory;
-import cn.cslg.report.entity.asso.AssoTaskPersonel;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 
 @Mapper
 public interface LitigationHistoryMapper extends BaseMapper<LitigationHistory> {

+ 1 - 3
RMS/src/main/java/cn/cslg/report/mapper/ReferencesMapper.java

@@ -1,12 +1,10 @@
 package cn.cslg.report.mapper;
 
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.entity.References;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 
 @Mapper
 public interface ReferencesMapper extends BaseMapper<References> {

+ 1 - 1
RMS/src/main/java/cn/cslg/report/mapper/ReportDocumentMapper.java

@@ -1,7 +1,7 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.ReportDocument;
-import cn.cslg.report.entity.Template;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 1
RMS/src/main/java/cn/cslg/report/mapper/ReportFieldMapper.java

@@ -2,7 +2,7 @@ package cn.cslg.report.mapper;
 
 import cn.cslg.report.common.model.dto.PatentQueryFieldSourceDTO;
 import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
-import cn.cslg.report.entity.CompareFiles;
+
 import cn.cslg.report.entity.ReportField;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 @Mapper
+@SuppressWarnings({"all"})
 public interface ReportFieldMapper extends BaseMapper<ReportField> {
     List<ReportField> find(@Param("reportId") int reportId,@Param("id") int id);
     int deleteReportId(@Param("reportId") int reportId,@Param("id") int id);

+ 0 - 2
RMS/src/main/java/cn/cslg/report/mapper/ReportFieldTextMapper.java

@@ -2,9 +2,7 @@ package cn.cslg.report.mapper;
 
 import cn.cslg.report.entity.ReportFieldText;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
 
 /**
  * <p>

+ 1 - 4
RMS/src/main/java/cn/cslg/report/mapper/ReviewHistoryMapper.java

@@ -1,12 +1,9 @@
 package cn.cslg.report.mapper;
 
-import cn.cslg.report.entity.Features;
+
 import cn.cslg.report.entity.ReviewHistory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 @Mapper
 public interface ReviewHistoryMapper extends BaseMapper<ReviewHistory> {

+ 19 - 1
RMS/src/main/java/cn/cslg/report/service/business/AssoComapareFielService.java

@@ -8,16 +8,34 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.util.List;
-
+@SuppressWarnings({"all"})
 @Service
 public class AssoComapareFielService extends ServiceImpl<AssoComapareFielMapper, AssoComapareFiel> {
+    /**
+     * 增加 对比文件标引关联表 对应实体comapareFiel
+     * @param comapareFiel
+     * @throws IOException
+     */
     public void add(AssoComapareFiel comapareFiel) throws IOException{
         comapareFiel.insert();
 
     }
+
+    /**
+     *  修改 对比文件标引关联表 对应实体comapareFiel
+     * @param assoComapareFiel
+     * @throws IOException
+     */
     public void   updateAssoComapareFiel(AssoComapareFiel assoComapareFiel)throws  IOException{
         assoComapareFiel.updateById();
     }
+
+    /**
+     * @function 根据对比文件的id查询
+     * @param id 对比文件id
+     * @return 对比文件标引关联表 对应实体comapareFiel
+     * @throws IOException
+     */
     public List<AssoComapareFiel>  select(int id)throws  IOException{
         LambdaQueryWrapper<AssoComapareFiel> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(AssoComapareFiel::getCompareFileID,id);

+ 8 - 3
RMS/src/main/java/cn/cslg/report/service/business/AssoInvalidRecordFileService.java

@@ -2,9 +2,9 @@ package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.asso.AssoInvalidRecordFile;
-import cn.cslg.report.entity.asso.AssoReportFile;
+
 import cn.cslg.report.mapper.AssoInvalidRecordFileMapper;
-import cn.cslg.report.mapper.AssoReportFileMapper;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,12 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoInvalidRecordFileService extends ServiceImpl<AssoInvalidRecordFileMapper, AssoInvalidRecordFile> {
 
-    //添加
+    /**
+     * @function 增加无效记录-文件关联表 对应实体:AssoInvalidRecordFile
+     * @param id 无效记录id
+     * @param fileIds 文件id
+     * @return
+     */
     public String addAsso(Integer id, List<Integer> fileIds) {
         List<AssoInvalidRecordFile> tems = new ArrayList<>();
         fileIds.forEach(item -> {

+ 8 - 3
RMS/src/main/java/cn/cslg/report/service/business/AssoLitigationHisFileService.java

@@ -2,9 +2,9 @@ package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.asso.AssoLitigationHisFile;
-import cn.cslg.report.entity.asso.AssoReportFile;
+
 import cn.cslg.report.mapper.AssoLitigationHisFileMapper;
-import cn.cslg.report.mapper.AssoReportFileMapper;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +19,12 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoLitigationHisFileService extends ServiceImpl<AssoLitigationHisFileMapper, AssoLitigationHisFile> {
 
-    //添加
+    /**
+     * @function 增加诉讼历史-文件关联表 对应实体:AssoLitigationHisFile
+     * @param id 诉讼历史id
+     * @param fileIds 文件id
+     * @return
+     */
     public String addAsso(Integer id, List<Integer> fileIds) {
         List<AssoLitigationHisFile> tems = new ArrayList<>();
         fileIds.forEach(item -> {

+ 4 - 15
RMS/src/main/java/cn/cslg/report/service/business/AssoRecordsFeatureService.java

@@ -1,28 +1,17 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.utils.Response;
+
 import cn.cslg.report.entity.asso.AssoRecordsFeature;
-import cn.cslg.report.entity.asso.AssoTaskPersonel;
+
 import cn.cslg.report.mapper.AssoRecordsFeatureMapper;
-import cn.cslg.report.mapper.AssoTaskPersonelMapper;
-import com.alibaba.fastjson.JSONObject;
-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 okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import org.springframework.beans.factory.annotation.Value;
+
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 
 @Service
 @Slf4j

+ 8 - 3
RMS/src/main/java/cn/cslg/report/service/business/AssoReferenceFileService.java

@@ -1,9 +1,9 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.asso.AssoLitigationHisFile;
+
 import cn.cslg.report.entity.asso.AssoReferenceFile;
-import cn.cslg.report.mapper.AssoLitigationHisFileMapper;
+
 import cn.cslg.report.mapper.AssoReferenceFileMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +19,12 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class AssoReferenceFileService extends ServiceImpl<AssoReferenceFileMapper, AssoReferenceFile> {
 
-    //添加
+    /**
+     *@function 增加其他资料和文件关联表 对应实体:AssoReferenceFile
+     * @param id 其他参考资料的id
+     * @param fileIds 文件id
+     * @return
+     */
     public String addAsso(Integer id, List<Integer> fileIds) {
         List<AssoReferenceFile> tems = new ArrayList<>();
         fileIds.forEach(item -> {

+ 23 - 23
RMS/src/main/java/cn/cslg/report/service/business/AssoReportFileService.java

@@ -1,8 +1,8 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.model.vo.FileVO;
+
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.ReportFiles;
+
 import cn.cslg.report.entity.asso.AssoReportFile;
 
 import cn.cslg.report.mapper.AssoReportFileMapper;
@@ -17,15 +17,22 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+
 
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, AssoReportFile> {
 
     private final ReportFileService reportFileService;
-    //添加
+
+    /**
+     * @function 上传报告报告与文件关联表 对应实体AssoReportFile 0代表上传文件为附件
+     * @param reportId 报告id
+     * @param fileIds 文件id
+     * @return
+     */
     public String addAsso(Integer reportId, List<Integer> fileIds) {
         List<AssoReportFile> assoReportFiles = new ArrayList<>();
         fileIds.forEach(item -> {
@@ -38,6 +45,13 @@ public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, Ass
            this.saveBatch(assoReportFiles);
         return Response.success();
     }
+    /**
+     * @function 上传报告报告与文件关联表 对应实体AssoReportFile 1代表上传最终报告
+     * @param reportId 报告id
+     * @param fileIds 文件id
+     * @return
+     */
+
     public String add(Integer reportId, List<Integer> fileIds){
         List<AssoReportFile> assoReportFiles = new ArrayList<>();
         fileIds.forEach(item -> {
@@ -52,7 +66,11 @@ public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, Ass
     }
 
 
-    //根据报告Id查询文件Id
+    /**
+     * @function 根据报告id 查询上传报告报告与文件关联表
+     * @param reportIds 报告id
+     * @return 查询上传报告报告与文件关联表 对应实体AssoReportFile
+     */
     public List<AssoReportFile> queryFileByReportId(List<Integer> reportIds){
         if(reportIds.size()==0){
             List<AssoReportFile> files=new ArrayList<>();
@@ -64,23 +82,5 @@ public class AssoReportFileService extends ServiceImpl<AssoReportFileMapper, Ass
         return assoReportFiles;
     }
 
-    public String upload(Integer reportID,List<MultipartFile> files)throws IOException{
-        List<Integer> integers = reportFileService.uploadFiles(files);
-        for(Integer integer :integers){
-
-            AssoReportFile assoReportFile = new AssoReportFile();
-            assoReportFile.setReportId(reportID);
-            assoReportFile.setFileId(integer);
-            assoReportFile.setFileType(1);
-            assoReportFile.insert();
-
-        }
-        return Response.success();
-
-    }
-
-
-
-
 
 }

+ 15 - 2
RMS/src/main/java/cn/cslg/report/service/business/AssoReportReferencesService.java

@@ -1,9 +1,9 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.asso.AssoReportFile;
+
 import cn.cslg.report.entity.asso.AssoReportReferences;
-import cn.cslg.report.mapper.AssoReportFileMapper;
+
 import cn.cslg.report.mapper.AssoReportReferencesMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,7 +18,14 @@ import java.util.List;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class AssoReportReferencesService extends ServiceImpl<AssoReportReferencesMapper, AssoReportReferences> {
+    /**
+     * @function 增加报告参考资料和文件关联表
+     * @param ReportReferencesID 报告参考资料id
+     * @param fileID 文件id
+     * @return 增加是否成功
+     */
     public String add(int ReportReferencesID, List<Integer> fileID){
         List<AssoReportReferences> list=new ArrayList<>();
         fileID.forEach(item ->{
@@ -30,6 +37,12 @@ public class AssoReportReferencesService extends ServiceImpl<AssoReportReference
         this.saveBatch(list);
         return Response.success();
     }
+
+    /**
+     * @function 根据其他参考资料的id查询报告参考资料和文件关联表
+     * @param ReportReferencesID
+     * @return
+     */
     public List<AssoReportReferences> select(int ReportReferencesID){
         LambdaQueryWrapper<AssoReportReferences> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(AssoReportReferences::getReportReferencesID,ReportReferencesID);

+ 9 - 4
RMS/src/main/java/cn/cslg/report/service/business/AssoReviewHisFileService.java

@@ -1,10 +1,9 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.asso.AssoLitigationHisFile;
-import cn.cslg.report.entity.asso.AssoReportFile;
+
 import cn.cslg.report.entity.asso.AssoReviewHisFile;
-import cn.cslg.report.mapper.AssoReportFileMapper;
+
 import cn.cslg.report.mapper.AssoReviewHisFileMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -18,9 +17,15 @@ import java.util.List;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class AssoReviewHisFileService extends ServiceImpl<AssoReviewHisFileMapper, AssoReviewHisFile> {
 
-    //添加
+    /**
+     * @function  增加 审查历史-文件关联表
+     * @param id 历史审查记录id
+     * @param fileIds 文件id
+     * @return 增加是否成功
+     */
     public String addAsso(Integer id, List<Integer> fileIds) {
         List<AssoReviewHisFile> tems = new ArrayList<>();
         fileIds.forEach(item -> {

+ 8 - 2
RMS/src/main/java/cn/cslg/report/service/business/AssoScenarIOSService.java

@@ -1,9 +1,9 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.entity.AssoScenarIOS;
-import cn.cslg.report.entity.CompareScenarios;
+
 import cn.cslg.report.mapper.AssoScenarIOSMapper;
-import cn.cslg.report.mapper.CompareScenariosMapper;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -16,7 +16,13 @@ import java.util.List;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class AssoScenarIOSService extends ServiceImpl<AssoScenarIOSMapper, AssoScenarIOS> {
+    /**
+     * @function 查询对比方案与对比记录关联表
+     * @param scenariosID 对比方案id
+     * @return 对比方案与对比记录关联表 对应实体 AssoScenarIOS
+     */
     public List<AssoScenarIOS> select(int scenariosID){
         LambdaQueryWrapper<AssoScenarIOS> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(AssoScenarIOS::getScenariosID,scenariosID);

+ 28 - 11
RMS/src/main/java/cn/cslg/report/service/business/AssoTaskPersonelService.java

@@ -1,33 +1,30 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.core.base.Constants;
-import cn.cslg.report.common.model.vo.PatentVO;
-import cn.cslg.report.common.utils.LogExceptionUtil;
+
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.SysDictItem;
+
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.AssoTaskPersonelMapper;
-import cn.cslg.report.mapper.SystemDictItemMapper;
+
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import lombok.val;
+
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
+
 
 import java.io.IOException;
-import java.sql.Wrapper;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +33,7 @@ import java.util.Objects;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper, AssoTaskPersonel> {
    public final  AssoTaskPersonelMapper assoTaskPersonelMapper ;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
@@ -44,12 +42,29 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
     @Value("${PASUrl}")
     private String PASUrl;
     public  void test(){}
+
+    /**
+     * @function 根据报告id 删除任务人员关联表对应实体assoTaskPersonel
+     * @param reportId
+     * @return
+     * @throws IOException
+     */
     public String deleAssoTaskPersonel(Integer reportId) throws IOException{
         LambdaQueryWrapper<AssoTaskPersonel> wrappers =new LambdaQueryWrapper();
         wrappers.eq(AssoTaskPersonel::getReportId,reportId);
          this.remove(wrappers);
         return Response.success();
     }
+
+    /**
+     *
+     * @param personelId
+     * @param state
+     * @param taskId
+     * @param location
+     * @return
+     * @throws IOException
+     */
     public String pagination(int personelId , int  state, int taskId,int location)throws IOException{
 
         List<String> patentNumber = assoTaskPersonelMapper.getPatentNumber(personelId, state, taskId);
@@ -58,11 +73,13 @@ public class AssoTaskPersonelService extends ServiceImpl<AssoTaskPersonelMapper,
    map.put("startNumber",location);
         JSONObject json = new JSONObject(map);
            RequestBody requestBody =RequestBody.create(JSON,String.valueOf(json));
+           //网络通信协议调  分析系统api/v2/patent/getPagination
         OkHttpClient okHttpClient = new OkHttpClient();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/patent/getPagination")
                 .post(requestBody)
                 .build();
+        //获取分析系统api/v2/patent/getPagination 返回值
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();
 
     }

+ 37 - 26
RMS/src/main/java/cn/cslg/report/service/business/CompareFilesService.java

@@ -1,16 +1,12 @@
 package cn.cslg.report.service.business;
-
-import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.model.dto.CustomFieldLabelDTO;
-import cn.cslg.report.common.model.dto.PatentQueryFieldSourceDTO;
+
 import cn.cslg.report.common.model.vo.CompareFilesVO;
 import cn.cslg.report.common.model.vo.PatentIndexSettingVO;
-import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
-import cn.cslg.report.common.model.vo.PatentVO;
 
+import cn.cslg.report.common.model.vo.PatentVO;
 import cn.cslg.report.common.utils.JsonUtils;
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.common.utils.StringUtils;
 import cn.cslg.report.entity.*;
 import cn.cslg.report.entity.asso.AssoTaskPersonel;
 import cn.cslg.report.mapper.CompareFilesMapper;
@@ -18,20 +14,14 @@ import cn.cslg.report.service.OutInterfaceService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+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 org.springframework.transaction.annotation.Transactional;
-
 import java.io.IOException;
-
 import java.util.*;
 import java.util.stream.Collectors;
 @SuppressWarnings({"all"})
@@ -56,6 +46,7 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         Report report = reportService.getById(compareFilesVO.getReportId());
         //根据标的专利号获得专利信息
         String res1 = outInterfaceService.getPatentFromPAS( report.getSignPatentNo());
+
         JSONObject res1Object = JSONObject.parseObject(res1);
         JSONObject patentNoJSON = JSONObject.parseObject(res1Object.get("data").toString());
             //获得引用专利号
@@ -68,8 +59,10 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             familyPatentNos = JsonUtils.jsonToList(JsonUtils.objectToJson(familyJson), String.class);
         }
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
+        //根据报告id 获取文件对比表的详情
         queryWrapper.eq(CompareFiles::getReportId, compareFilesVO.getReportId());
         List<CompareFiles> compareFile1 = this.list(queryWrapper);
+        //获取对比文件对比表的专利号
         List<String> patentNoList = compareFile1.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         List<CompareFiles> compareFiles = new ArrayList<>();
         PatentVO patentVO = new PatentVO();
@@ -77,48 +70,63 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         patentVO.setEndNumber(compareFilesVO.getEndNumber());
         patentVO.setReportId(compareFilesVO.getReportId());
         patentVO.setPatentNos(patentNoList);
+        // 见outInterfaceService getComPatentNos接口
         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());
+        //添加新的
         patentNos.addAll(compareFilesVO.getIsAdd());
+        //获取对比文件对比表的专利号
         patentNos.removeAll(patentNoList);
         for(int i=0;i<patentNos.size();i++){
             CompareFiles compareFiles1 = new CompareFiles();
+            //根据专利号和报告id造对象
             compareFiles1.setPatentNo(patentNos.get(i));
             compareFiles1.setReportId(compareFilesVO.getReportId());
+            //区分对比文件的类型
             if (familyPatentNos != null&&quotes.size() != 0 && quotes.contains(patentNos.get(i))) {
                 compareFiles1.setRemark("引");
             }
             if (familyPatentNos != null&&familyPatentNos.size() != 0  && familyPatentNos.contains(patentNos.get(i))) {
                 compareFiles1.setRemark("同");
             }
+
             compareFiles.add(compareFiles1);
         }
-
+        // 批量添加
         this.saveBatch(compareFiles);
         return Response.success();
     }
 
-
     public String getCompareFile(PatentVO patentVO) throws IOException {
         LambdaQueryWrapper<CompareFiles> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CompareFiles::getReportId, patentVO.getReportId());
-
+        //根据报告id 获取文件对比表的详情
         List<CompareFiles> compareFiles = this.list(queryWrapper);
+        //获取文件对比表的详情的专利号
         List<String> patentNos = compareFiles.stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         String res;
+        //1 代表已读
         if (patentVO.getState() == 1) {
             patentVO.setPatentNos(patentNos);
+            //详情见outInterfaceService.getPatentFromPAS
             res = outInterfaceService.getPatentFromPAS(patentVO, 1);
 
         } else {
+            //根据标的专利号和报告id找到报告
             LambdaQueryWrapper<Report> wrapper1 = new LambdaQueryWrapper<>();
             wrapper1.select(Report::getSignPatentNo);
             wrapper1.eq(Report::getId, patentVO.getReportId());
+            //获取标的专利号
+            if(reportService.list(wrapper1).size()==0){
+                return "";
+            }
             String signPatentNO = reportService.list(wrapper1).get(0).getSignPatentNo();
             patentNos.add(signPatentNO);
             patentVO.setNotInPatentNos(patentNos);
+            //详情见outInterfaceService.getPatentFromPAS
             res = outInterfaceService.getPatentFromPAS(patentVO, 0);
 
         }
@@ -127,11 +135,13 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
         List<JSONObject> list = JSONArray.parseArray(resData.getString("records"), JSONObject.class);
         List<String> temNos = new ArrayList<>();
         for (int i = 0; i < list.size(); i++) {
+            //查到专利的专利号在标的内拿到
             if (patentNos.contains(list.get(i).get("patentNo").toString())) {
                 temNos.add(list.get(i).get("patentNo").toString());
             }
 
         }
+        //根据报告id获取对比文件的数量
         int i = compareFilesMapper.selectedTotal(patentVO.getReportId());
         Map<String, Object> map = new HashMap<>();
         map.put("datas", resData);
@@ -198,17 +208,22 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             LambdaQueryWrapper<CompareFiles> wrapper = new LambdaQueryWrapper<>();
             wrapper.select(CompareFiles::getPatentNo)
                     .eq(CompareFiles::getReportId, compareFilesVO.getReportId())
+                    //分页查询 传的起始条数和结束条数
                     .last("limit" + (compareFilesVO.getStartNumber() - 1) + "," + compareFilesVO.getEndNumber());
             patentNos = this.list(wrapper).stream().map(CompareFiles::getPatentNo).collect(Collectors.toList());
         }
+        //减少的专利号
         if (compareFilesVO.getIsDelete() != null) {
             patentNos.removeAll(compareFilesVO.getIsDelete());
         }
+        //增加的专利号
         if (compareFilesVO.getIsAdd() != null) {
             patentNos.addAll(compareFilesVO.getIsAdd());
         }
+        //根据专利号删除
         if (patentNos.size() != 0) {
             LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+
             lambdaQueryWrapper.in(CompareFiles::getPatentNo, patentNos);
             this.remove(lambdaQueryWrapper);
         }
@@ -223,9 +238,8 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
 
     public List<CustomFieldLabelDTO> setAll(Integer reportId, String patentNos) throws IOException{
         List<CustomFieldLabelDTO> dataList = new ArrayList<>();
+        //根据报告id找到对比文件
         List<ReportField> reportFields = reportFieldService.selectAll(reportId);
-
-
         for(ReportField reportField:reportFields) {
             PatentIndexSettingVO params = new PatentIndexSettingVO();
             CustomFieldLabelDTO data = new CustomFieldLabelDTO();
@@ -236,9 +250,9 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
             data.setName(reportField.getName());
             data.setId(reportField.getId());
             data.setType(reportField.getType());
+            //详细见reportFieldPatentLinkService getPatentIndexSetting方法
             data.setSelected(reportFieldPatentLinkService.getPatentIndexSetting(params));
             dataList.add(data);
-
         }
 
         return dataList;
@@ -249,24 +263,21 @@ public class CompareFilesService extends ServiceImpl<CompareFilesMapper, Compare
 
     @Transactional(rollbackFor = Exception.class)
     public void getPatentIndexSetting(PatentIndexSettingVO params)throws IOException {
+        //详情见reportFieldPatentLinkService updatePatentIndexSetting方法
        reportFieldPatentLinkService.updatePatentIndexSetting(params);
 
     }
-    public IPage<PatentQueryFieldSourceDTO> getPatentQuerySourcePageList(PatentQueryFieldSourceVO params) {
-        return this.getPatentAttributeSourcePageList(params);
-    }
 
-    public IPage<PatentQueryFieldSourceDTO> getPatentAttributeSourcePageList(PatentQueryFieldSourceVO params) {
 
-        return  null;
-    }
 
     public Map<String, Object> reTaskStateCount(Integer reportId) {
-        //根据任务Id和类型获得任务的清单
+        //根据报告id查询对比方案与对比记录关联表的详细
         LambdaQueryWrapper<AssoTaskPersonel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AssoTaskPersonel::getReportId, reportId);
+
         List<AssoTaskPersonel> assoTaskPersonels = assoTaskPersonelService.list(queryWrapper);
         LambdaQueryWrapper<CompareFiles> queryWrapper1 = new LambdaQueryWrapper<>();
+        //根据报告id查询对比文件的详情
         queryWrapper1.eq(CompareFiles::getReportId,reportId);
         List<CompareFiles> compareFiles = this.list(queryWrapper1);
         Map<String, Object> reMap = new HashMap<>();

+ 28 - 0
RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java

@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, CompareRecords> {
     public final CompareRecordsMapper compareRecordsMapper;
     public final FeatureMapper featureMapper;
@@ -38,6 +39,7 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
     @Transactional(rollbackFor = Exception.class)
     public String addCompareRecord(CompareRecords compareRecord) throws IOException {
         compareRecord.insert();
+        //对比方案与对比记录关联表对比文件添加
         List<AssoRecordsFeature> assoRecordsFeatures = compareRecord.getAssoRecordsFeatures();
         assoRecordsFeatures.forEach(item -> item.setRecordsId(compareRecord.getId()));
         assoRecordsFeatureService.saveBatch(assoRecordsFeatures);
@@ -52,21 +54,34 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
 
     @Transactional(rollbackFor = Exception.class)
     public String updateCompareRecords(CompareRecords compareRecord) throws IOException {
+        //根据对比文件的id 获取对比方案与对比记录关联表的内容
         LambdaQueryWrapper<AssoRecordsFeature> queryWrapper =new LambdaQueryWrapper<>();
         queryWrapper.eq(AssoRecordsFeature::getRecordsId,compareRecord.getId());
+        //删除获取的内容
         assoRecordsFeatureService.remove(queryWrapper);
         List<AssoRecordsFeature> assoRecordsFeatures = compareRecord.getAssoRecordsFeatures();
         assoRecordsFeatures.forEach(item -> item.setRecordsId(compareRecord.getId()));
+        //重新插入对比方案与对比记录关联表的内容
         assoRecordsFeatureService.saveBatch(assoRecordsFeatures);
         return Response.success();
     }
 
+    /**
+     * @function: 根据对比记录的报告id,任务
+     * @param compareRecord
+     * @return 对比文件 对应实体:compareFiles 对比记录 对应实体:compareRecord
+     * @throws IOException
+     */
+
     public String getCompareRecords(CompareRecords compareRecord) throws IOException {
+        //根据报告id查询对比文件
         LambdaQueryWrapper<CompareRecords> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CompareRecords::getReportId, compareRecord.getReportId());
+        //根据标的专利号获取对比文件
         if (compareRecord.getPatentNo() != null) {
             wrapper.eq(CompareRecords::getPatentNo, compareRecord.getPatentNo());
         }
+        //根据任务id查询对比文件
         if(compareRecord.getTaskId()!=null){
            wrapper.eq(CompareRecords::getTaskId,compareRecord.getTaskId());
         }
@@ -75,17 +90,21 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         if (compareRecords.size() == 0 || compareRecords == null) {
             return Response.success(list);
         }
+        //获取对比文件的id
         List<Integer> ids = compareRecords.stream().map(CompareRecords::getId).collect(Collectors.toList());
         if (ids.size() == 0) {
             return Response.success(compareRecords);
         }
+        //根据任务id获取获取对比方案与对比记录关联表
         LambdaQueryWrapper<AssoRecordsFeature> assoWrapper = new LambdaQueryWrapper<>();
         assoWrapper.in(AssoRecordsFeature::getRecordsId, ids);
         List<AssoRecordsFeature> assoRecordsFeatures = assoRecordsFeatureService.list(assoWrapper);
+        //获取特征id
         List<Integer> featureIds = assoRecordsFeatures.stream().map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
         List<Features> features = new ArrayList<>();
         if (featureIds.size() != 0 && featureIds != null) {
             LambdaQueryWrapper<Features> featuresLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            //获取标的专利的特征
             featuresLambdaQueryWrapper.in(Features::getId, featureIds);
             features = featureService.list(featuresLambdaQueryWrapper);
 
@@ -93,8 +112,10 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         List<String> headerPatentNos = new ArrayList<>();
         for (CompareRecords records : compareRecords) {
             List<AssoRecordsFeature> assoRecordsFeatures1 = assoRecordsFeatures.stream().filter(item -> item.getRecordsId().equals(records.getId())).collect(Collectors.toList());
+            //获取特征id
             List<Integer> featureId = assoRecordsFeatures1.stream().map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
             records.setAssoRecordsFeatures(assoRecordsFeatures1);
+            //根据获取的过滤
             List<Features> featuresList = features.stream().filter(item -> featureId.contains(item.getId())).collect(Collectors.toList());
             records.setFeaturesIdList(featureId);
             records.setFeatures(featuresList);
@@ -104,6 +125,7 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         List<CompareFiles> compareFiles =new ArrayList<>();
         if(headerPatentNos.size()!=0){
             LambdaQueryWrapper<CompareFiles> lambdaQueryWrapper =new LambdaQueryWrapper<>();
+            //获取对比文件
             lambdaQueryWrapper.in(CompareFiles::getPatentNo,headerPatentNos).eq(CompareFiles::getReportId,compareRecord.getReportId());
              compareFiles =compareFilesService.list(lambdaQueryWrapper);
 
@@ -114,6 +136,12 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
         map.put("records",compareRecords);
         return Response.success(map);
     }
+
+    /**
+     * @function: 根据对比方案的id查询对比方案
+     * @param :对比方案的id;
+     * @return 对比方案,对应实体:CompareRecords
+     */
     public CompareRecords get(int id){
         LambdaQueryWrapper<CompareRecords> lambdaQueryWrapper =new LambdaQueryWrapper<>();
         lambdaQueryWrapper.in(CompareRecords::getId,id);

+ 7 - 3
RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosAndRecordsService.java

@@ -2,10 +2,9 @@ package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.AssoScenarIOS;
-import cn.cslg.report.entity.CompareScenarios;
+
 import cn.cslg.report.mapper.AssoScenarIOSMapper;
-import cn.cslg.report.mapper.CompareScenariosAndRecordsMapper;
-import cn.cslg.report.mapper.CompareScenariosMapper;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,6 +15,11 @@ import org.springframework.stereotype.Service;
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class CompareScenariosAndRecordsService extends ServiceImpl<AssoScenarIOSMapper, AssoScenarIOS> {
+    /**
+     * @function 添加对比方案与对比记录
+     * @param compareScenariosAndRecords
+     * @return 是否成功
+     */
     public  String add(AssoScenarIOS compareScenariosAndRecords){
         compareScenariosAndRecords.insert();
         return Response.success();

+ 23 - 3
RMS/src/main/java/cn/cslg/report/service/business/CompareScenariosService.java

@@ -8,7 +8,7 @@ import cn.cslg.report.entity.asso.AssoRecordsFeature;
 import cn.cslg.report.mapper.CompareScenariosMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.swagger.v3.oas.models.security.SecurityScheme;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -23,6 +23,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper, CompareScenarios> {
     private final CompareScenariosAndRecordsService compareScenariosAndRecordsService;
     private final AssoScenarIOSService assoScenarIOSService;
@@ -31,18 +32,28 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
     private final CompareRecordsService compareRecordsService;
     private final FeatureService featureService;
     private final AssoRecordsFeatureService assoRecordsFeatureService;
+
+    /**
+     * @function:添加对比文件根据,关联表:同时添加对比方案与对比记录关联表
+     * @param compareScenariosVO
+     * @return 是否成功
+     * @throws IOException
+     *
+     */
     public String add(CompareScenariosVO compareScenariosVO) throws IOException{
         //对比方案信息入表
         CompareScenarios compareScenarios = new CompareScenarios();
         compareScenarios.setContrastResult(compareScenariosVO.getContrastResult());
         compareScenarios.setReportId(compareScenariosVO.getReportId());
         compareScenarios.setRightName(compareScenariosVO.getRight());
+        //拿到当前登录人的id
         compareScenarios.setPersonId(loginUtils.getId());
         compareScenarios.setRightId(compareScenariosVO.getRightId());
         compareScenarios.setSignPatentNo(compareScenariosVO.getSignPatentNo());
         compareScenarios.insert();
         Integer id = compareScenarios.getId();
         List<Integer> FeaturesId = compareScenariosVO.getFeaturesIDList();
+        //根据特征id来插入对比方案与对比记录关联表
         for(Integer integer:FeaturesId){
             AssoScenarIOS compareScenariosAndRecords = new AssoScenarIOS();
             compareScenariosAndRecords.setScenariosID(id);
@@ -50,6 +61,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             compareScenariosAndRecords.setFeatureRecordID(0);
             compareScenariosAndRecordsService.add(compareScenariosAndRecords);
         }
+        //根据共识来插入
         List<Integer> recordIDList = compareScenariosVO.getRecordIDList();
         for(Integer integer:recordIDList) {
             AssoScenarIOS compareScenariosAndRecords = new AssoScenarIOS();
@@ -61,6 +73,12 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
        return Response.success();
     }
 
+    /**
+     * @function:根据报告id查询对比方案
+     * @param reportID
+     * @return:对比方案 对应实体:CompareScenariosVO
+     * @throws IOException
+     */
     public String select(int reportID)throws IOException{
        List<CompareScenariosVO> list=new ArrayList<>();
        //根据报告ID查询对比方案
@@ -83,7 +101,7 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             LambdaQueryWrapper<AssoRecordsFeature> wrapper1 =new LambdaQueryWrapper<>();
             wrapper1.in(AssoRecordsFeature::getId,featureRecordIds);
             List<AssoRecordsFeature> assoRecordsFeatures =assoRecordsFeatureService.list(wrapper1);
-            //特征Id
+            //获取特征Id
             List<Integer> featureIds= assoRecordsFeatures.stream().map(AssoRecordsFeature::getFeatureId).collect(Collectors.toList());
             //对比记录Id
             List<Integer> recordId  =assoRecordsFeatures.stream().map(AssoRecordsFeature::getRecordsId).collect(Collectors.toList());
@@ -97,14 +115,16 @@ public class CompareScenariosService extends ServiceImpl<CompareScenariosMapper,
             List<CompareRecords> compareRecords =compareRecordsService.list(wrapper3);
             assoRecordsFeatures.forEach(
                  item->{
+                     //过滤特征
                   Features features1 =features.stream().filter(tem->tem.getId().equals(item.getFeatureId())).findFirst().orElse(new Features());
+                    //筛选对比文件
                   CompareRecords compareRecords1 =compareRecords.stream().filter(tem->tem.getId().equals(item.getRecordsId())).findFirst().orElse(new CompareRecords());
                      item.setCompareRecords(compareRecords1);
                      item.setFeatures(features1);
                  }
 
             );
-
+            //过滤拿到特征id
            List<Integer> featuresIds =select.stream().filter(item->item.getFeatureRecordID().equals(0)).map(AssoScenarIOS::getFeaturesID).collect(Collectors.toList());
             compareScenariosVO.setFeaturesIDList(featuresIds);
             compareScenariosVO.setAssoRecordsFeatures(assoRecordsFeatures);

+ 8 - 0
RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -31,6 +31,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
 
     private final OutInterfaceService outInterfaceService;
@@ -67,6 +68,9 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
         PersonnelVO personnelVO = cacheUtils.getLoginUser(StpUtil.getLoginIdAsInt());
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(Report::getId, reportId);
+       if( reportService.list(queryWrapper).size()==0){
+           return Response.error();
+       }
         Report report = reportService.list(queryWrapper).get(0);
         Integer flag = 0;
         if(splitBy==null){
@@ -213,9 +217,13 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
 
     }
 
+
     public String getFeatures(String patentNos, Integer reportId) throws IOException {
         LambdaQueryWrapper<Report> queryWrapper = new LambdaQueryWrapper();
         queryWrapper.eq(Report::getId, reportId);
+        if(reportService.list(queryWrapper).size()==0){
+            return "";
+        }
         Report report = reportService.list(queryWrapper).get(0);
         //权要(带拆分的特征)列表
         List<PatentRightVo> patentRightVos = new ArrayList<>();

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

@@ -14,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 
 
 /**
@@ -23,6 +22,7 @@ import java.util.List;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask> {
     public String reImportTask(ImportTask importTask) {
         LambdaQueryWrapper<ImportTask> queryWrapper = new LambdaQueryWrapper<>();

+ 1 - 3
RMS/src/main/java/cn/cslg/report/service/business/InvalidRecordService.java

@@ -3,8 +3,6 @@ package cn.cslg.report.service.business;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.*;
 import cn.cslg.report.entity.asso.AssoInvalidRecordFile;
-import cn.cslg.report.entity.asso.AssoReportFile;
-import cn.cslg.report.mapper.ImportTaskMapper;
 import cn.cslg.report.mapper.InvalidRecordMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +14,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -25,6 +22,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, InvalidRecord> {
     public final InvalidRecordMapper invalidRecordMapper;
     private final ReportFileService reportFileService;

+ 4 - 3
RMS/src/main/java/cn/cslg/report/service/business/LitigationHistoryService.java

@@ -1,10 +1,10 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.utils.DataUtils;
+
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.*;
 import cn.cslg.report.entity.asso.AssoLitigationHisFile;
-import cn.cslg.report.mapper.ImportTaskMapper;
+
 import cn.cslg.report.mapper.LitigationHistoryMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMapper, LitigationHistory> {
     private final ReportFileService reportFileService;
     private final AssoLitigationHisFileService  assoLitigationHisFileService;

+ 4 - 4
RMS/src/main/java/cn/cslg/report/service/business/ReferencesService.java

@@ -2,12 +2,11 @@ package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.ReportFiles;
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.entity.References;
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.entity.asso.AssoReferenceFile;
-import cn.cslg.report.entity.asso.AssoReviewHisFile;
-import cn.cslg.report.mapper.ReviewHistoryMapper;
+
 import cn.cslg.report.mapper.ReferencesMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,6 +26,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReferencesService extends ServiceImpl<ReferencesMapper, References> {
   private  final ReportFileService reportFileService;
   private final AssoReferenceFileService assoReferenceFileService;

+ 2 - 1
RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -8,7 +8,7 @@ import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.*;
 import cn.cslg.report.entity.asso.AssoRecordsFeature;
 import cn.cslg.report.mapper.ReportDocumentMapper;
-import cn.cslg.report.mapper.TemplateMapper;
+
 import cn.cslg.report.service.OutInterfaceService;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
@@ -33,6 +33,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, ReportDocument> {
 
     private final OutInterfaceService outInterfaceService;

+ 2 - 1
RMS/src/main/java/cn/cslg/report/service/business/ReportFieldOptionService.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportFieldOptionService extends ServiceImpl<ReportFieldOptionMapper, ReportFieldOption> {
 
     private final ReportFieldPatentLinkService projectFieldPatentLinkService;

+ 14 - 0
RMS/src/main/java/cn/cslg/report/service/business/ReportFieldPatentLinkService.java

@@ -29,6 +29,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentLinkMapper, ReportFieldPatentLink> {
 
     private final ReportFieldTextService reportFieldTextService;
@@ -130,13 +131,24 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
 
 
     }
+
+    /**
+     * 根据专利号报告id对比自定义字段id找自定义字段
+     *
+     * @param params
+     * @return
+     * @throws IOException
+     */
     public List<LabelDTO> getPatentIndexSetting(PatentIndexSettingVO params) throws IOException {
+        //根据专利号报告id自定义字段的id找到ReportFieldPatentLink
         List<ReportFieldPatentLink> projectFieldPatentLinkList = this.getProjectPatentLinkByPatentAndProjectIdAndFieldId(params.getPatentNo(), params.getReportId(), params.getFieldId());
+        //找到不同类型自定义字段的id
         List<Integer> optionIds = projectFieldPatentLinkList.stream().map(ReportFieldPatentLink::getOptionId).collect(Collectors.toList());
         List<LabelDTO> mapList = new ArrayList<>();
         switch (params.getType()) {
             case 0:
             case 1:
+                //文本 时间
             case 2:
                 List<ReportFieldText> projectFieldTextList = reportFieldTextService.getProjectFieldTextByIds(optionIds);
                 for (ReportFieldText projectFieldText : projectFieldTextList) {
@@ -146,6 +158,7 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
                     mapList.add(map);
                 }
                 break;
+                //选项
             case 3:
             case 4:
             case 5:
@@ -157,6 +170,7 @@ public class ReportFieldPatentLinkService extends ServiceImpl<ReportFieldPatentL
                     mapList.add(map);
                 }
                 break;
+                //树类型
             case 6:
                 List<ReportFieldTree> projectFieldTreeList = reportFieldTreeService.getProjectFieldTreeOptionByIds(optionIds);
                 for (ReportFieldTree projectFieldTree : projectFieldTreeList) {

+ 1 - 3
RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java

@@ -1,7 +1,4 @@
 package cn.cslg.report.service.business;
-
-import cn.cslg.report.common.model.BaseEntity;
-import cn.cslg.report.common.model.dto.PatentQueryFieldSourceDTO;
 import cn.cslg.report.common.model.vo.PatentField;
 import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
 import cn.cslg.report.common.model.vo.ReportFieldVO;
@@ -39,6 +36,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportField> {
  private final ReportFieldMapper reportFieldMapper;
  private  final LoginUtils loginUtils;

+ 1 - 0
RMS/src/main/java/cn/cslg/report/service/business/ReportFieldTextService.java

@@ -24,6 +24,7 @@ import java.util.List;
  */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportFieldTextService extends ServiceImpl<ReportFieldTextMapper, ReportFieldText> {
 
     public ReportFieldText getProjectFieldTextByNameAndFieldId(String text, Integer fieldId) {

+ 1 - 0
RMS/src/main/java/cn/cslg/report/service/business/ReportFieldTreeService.java

@@ -35,6 +35,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportFieldTreeService extends ServiceImpl<ReportFieldTreeMapper, ReportFieldTree> {
 
     private final ReportFieldPatentLinkService reportFieldPatentLinkService;

+ 7 - 7
RMS/src/main/java/cn/cslg/report/service/business/ReportFileService.java

@@ -1,17 +1,16 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.model.dto.PatentQueryFieldSourceDTO;
+
 import cn.cslg.report.common.model.dto.UploadFileDTO;
-import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
-import cn.cslg.report.common.utils.DateUtils;
+
 import cn.cslg.report.common.utils.FileUtils;
-import cn.cslg.report.common.utils.Response;
+
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.ReportFiles;
 import cn.cslg.report.mapper.ReportFileMapper;
-import cn.hutool.core.io.FileUtil;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +18,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,6 +26,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportFileService extends ServiceImpl<ReportFileMapper, ReportFiles> {
     private  final FileUtils fileUtils;
     private final LoginUtils loginUtils;

+ 48 - 15
RMS/src/main/java/cn/cslg/report/service/business/ReportReferencesService.java

@@ -4,14 +4,13 @@ import cn.cslg.report.common.model.vo.PersonnelVO;
 import cn.cslg.report.common.utils.CacheUtils;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
-import cn.cslg.report.entity.InvalidRecord;
-import cn.cslg.report.entity.LitigationHistory;
+
 import cn.cslg.report.entity.ReportFiles;
 import cn.cslg.report.entity.ReportReferences;
-import cn.cslg.report.entity.asso.AssoLitigationHisFile;
-import cn.cslg.report.entity.asso.AssoReportFile;
+
+
 import cn.cslg.report.entity.asso.AssoReportReferences;
-import cn.cslg.report.mapper.ReportFileMapper;
+
 import cn.cslg.report.mapper.ReportReferencesMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
@@ -30,15 +29,16 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
+
 
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper, ReportReferences> {
     private final ReportFileService reportFileService;
     private final LoginUtils loginUtils;
-    private final AssoReportFileService assoReportFileService;
+
     private final CacheUtils cacheUtils;
     private final ReportService reportService;
     private final AssoReportReferencesService assoReportReferencesService;
@@ -63,6 +63,18 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
 
         return  Response.error();
     }
+
+    /**
+     *   查询分三种情况合在一起:
+     *                     { 1:普通查询
+     *                       2:分页查询
+     *                       3:根据文件名模糊查询
+     *                     }
+     * @antor:chenyi
+     * @param reportReferences
+     * @return
+     * @throws IOException
+     */
     public String queryReportReferences(ReportReferences reportReferences)throws IOException{
         LambdaQueryWrapper<ReportReferences> wrapper = new LambdaQueryWrapper<>();
         PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
@@ -73,18 +85,20 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
         wrapper.orderByDesc(ReportReferences::getId);
 
         List<ReportReferences> list=new ArrayList<>();
-
+       //分页查询
         if(reportReferences.getSize()!=null&&reportReferences.getCurrent()!=null){
             IPage<ReportReferences> pages = this.page(new Page<>(reportReferences.getCurrent(), reportReferences.getSize()), wrapper);
             List<ReportReferences> records = pages.getRecords();
 
             for(ReportReferences references :records) {
+                //根据id的精确查询和文件名的模糊查询
                 List<ReportFiles> reportFiles = this.ReportReferences(references.getId(), reportReferences.getFileName());
                 if (reportFiles.size() != 0) {
 
                     references.setPersonName(personnelVO.getName());
 
                     references.setReportName(name);
+
                     references.setReportFiles(reportFiles);
                     list.add(references);
                 }
@@ -113,11 +127,20 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
         return Response.success(list);
 
     }
+
+    /**
+     * @antor:chenyi
+     * @param id
+     * @return
+     * @throws IOException
+     */
     public String delete(int id)throws IOException{
         this.removeById(id);
+        //找到AssoReportReferences文件id
         LambdaQueryWrapper<AssoReportReferences> wrapper =new LambdaQueryWrapper<>();
         wrapper.eq(AssoReportReferences::getReportReferencesID,id);
         List<AssoReportReferences> list = assoReportReferencesService.list(wrapper);
+        //删除对应的文件
         reportFileService.removeByIds( list.stream().map(AssoReportReferences::getFileID).collect(Collectors.toList()));
         assoReportReferencesService.remove(wrapper);
        return Response.success();
@@ -125,13 +148,15 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
     }
 
     public List<ReportFiles> ReportReferences(int id ,String str){
+        //根据ReportReferences的id找到AssoReportReferences关联表的对象
         List<AssoReportReferences> select = assoReportReferencesService.select(id);
+        //找到文件ReportFiles的id
         List<Integer> collect = select.stream().map(AssoReportReferences::getFileID).collect(Collectors.toList());
         if(collect.size()==0){
             return null;
         }
         LambdaQueryWrapper<ReportFiles> wrapper = new LambdaQueryWrapper<>();
-
+        //根据ReportFiles的id和文件名
         wrapper.in(ReportFiles::getId, collect);
         if(str!=null&&str!=""){
             wrapper.like(ReportFiles::getName,str);
@@ -141,11 +166,23 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
 
     }
 
-
+    /**
+     * 判断传过来的文件集合是否为空
+     * 为空:只改reportReferences实体所对应的表
+     * 不为空: 先改reportReferences实体所对应的表
+     * 在删除关联AssoReportReferences 关联表的内容
+     * 在删除  reportFile内容
+     * 重新插入 reportFile
+     * 在插入 关联AssoReportReferences 关联表的内容
+     *
+     * @param reportReferences
+     * @param files
+     * @return
+     * @throws IOException
+     */
 
     public Boolean updateReportReferences(ReportReferences reportReferences,List<MultipartFile> files)throws IOException{
         if(files!=null && files.size() != 0 ){
-
             LambdaQueryWrapper<AssoReportReferences> wrapper =new LambdaQueryWrapper<>();
             wrapper.eq(AssoReportReferences::getReportReferencesID,reportReferences.getId());
             List<AssoReportReferences> list = assoReportReferencesService.list(wrapper);
@@ -154,10 +191,6 @@ public class ReportReferencesService extends ServiceImpl<ReportReferencesMapper,
                 reportFileService.removeByIds(collect);
                 List<Integer> fileIdList = reportFileService.uploadFiles(files);
                 assoReportReferencesService.add(reportReferences.getId(),fileIdList);
-
-
-
-
         }
         return reportReferences.updateById();
     }

+ 3 - 2
RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -7,7 +7,7 @@ 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.entity.Report;
-import cn.cslg.report.entity.ReportField;
+
 import cn.cslg.report.entity.ReportFiles;
 import cn.cslg.report.entity.asso.AssoReportFile;
 import cn.cslg.report.mapper.ReportMapper;
@@ -19,7 +19,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;
@@ -37,6 +37,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReportService extends ServiceImpl<ReportMapper, Report> {
     private final OutInterfaceService outInterfaceService;
     private final ReportMapper reportMapper;

+ 3 - 2
RMS/src/main/java/cn/cslg/report/service/business/ReviewHistoryService.java

@@ -3,10 +3,10 @@ package cn.cslg.report.service.business;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.entity.ReviewHistory;
 import cn.cslg.report.entity.ReportFiles;
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.entity.asso.AssoReviewHisFile;
 import cn.cslg.report.mapper.ReviewHistoryMapper;
-import cn.cslg.report.mapper.ReviewHistoryMapper;
+
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, ReviewHistory> {
 private final   ReportFileService reportFileService;
 private final AssoReviewHisFileService assoReviewHisFileService;

+ 1 - 0
RMS/src/main/java/cn/cslg/report/service/business/SysDictItemService.java

@@ -15,6 +15,7 @@ import java.util.List;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class SysDictItemService extends ServiceImpl<SystemDictItemMapper, SysDictItem> {
     public List<SysDictItem> getSystemDictListByType(List<String> type) {
         if (type == null || type.size() == 0) {

+ 3 - 2
RMS/src/main/java/cn/cslg/report/service/business/SystemDictItemService.java

@@ -3,9 +3,9 @@ package cn.cslg.report.service.business;
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.LogExceptionUtil;
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.Report;
+
 import cn.cslg.report.entity.SysDictItem;
-import cn.cslg.report.mapper.ReportMapper;
+
 import cn.cslg.report.mapper.SystemDictItemMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +19,7 @@ import java.util.*;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class SystemDictItemService extends ServiceImpl<SystemDictItemMapper, SysDictItem> {
     /**
      * @return 成功返回客户列表信息 失败返回错误信息

+ 3 - 2
RMS/src/main/java/cn/cslg/report/service/business/TaskService.java

@@ -1,6 +1,6 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.model.BaseVO;
+
 import cn.cslg.report.common.model.vo.*;
 import cn.cslg.report.common.utils.CacheUtils;
 import cn.cslg.report.common.utils.DataUtils;
@@ -20,7 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
+
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +36,7 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
+@SuppressWarnings({"all"})
 public class TaskService extends ServiceImpl<TaskMapper, Task> {
     private final ReportService reportService;
     private final OutInterfaceService outInterfaceService;

+ 3 - 4
RMS/src/main/java/cn/cslg/report/service/business/TemplateService.java

@@ -1,9 +1,9 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.entity.ReviewHistory;
+
 import cn.cslg.report.entity.Template;
-import cn.cslg.report.mapper.ReviewHistoryMapper;
+
 import cn.cslg.report.mapper.TemplateMapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -14,8 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
-import java.io.IOException;
-import java.util.List;
+
 
 @Service
 @Slf4j

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 4209 - 0
logs/rms/rms-debug.2022-12-07.1.log