替换报告系统涉及文件代码

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

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
+
 @SuppressWarnings({"all"})
 @Tag(name = "审查历史")
 @RestController
@@ -28,7 +29,7 @@ public class ReviewHistoryController {
     @RequestMapping(value = "/addReviewHistory", method = RequestMethod.POST)
     @Operation(summary = "增加审查历史")
     public String addReviewHistory(String jsons, List<MultipartFile> files) throws IOException {
-        ReviewHistory reviewHistory = JSONObject.parseObject(jsons,ReviewHistory.class);
+        ReviewHistory reviewHistory = JSONObject.parseObject(jsons, ReviewHistory.class);
         return reviewHistoryService.addReviewHistory(reviewHistory, files);
     }
 
@@ -36,13 +37,14 @@ public class ReviewHistoryController {
     @Operation(summary = "修改审查历史")
     @Transactional(rollbackFor = Exception.class)
     public String updateReviewHistory(String jsons, List<MultipartFile> files) throws IOException {
-        ReviewHistory reviewHistory = JSONObject.parseObject(jsons,ReviewHistory.class);
+        ReviewHistory reviewHistory = JSONObject.parseObject(jsons, ReviewHistory.class);
         Boolean flag = reviewHistoryService.updateReviewHistory(reviewHistory, files);
         if (flag) {
             return Response.success();
         }
         return Response.error();
     }
+
     @GetMapping(value = "/deleReviewHistory")
     @Operation(summary = "删除审查历史")
     public String deleReviewHistory(int id) throws IOException {

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

@@ -165,7 +165,6 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
 //                List<ReportFiles> reportFiles = reportFileService.list(wrapper);
                 String res = fileManagerService.getSystemFileFromFMS(fileIds);
                 List<SystemFile> systemFiles = JSONArray.parseArray(res, SystemFile.class);
-
                 //遍历装载文件信息
                 invalidRecords.forEach(item -> {
                     List<AssoInvalidRecordFile> partAsso = assoInvalidRecordFiles.stream().filter(tem -> tem.getInvalidId().equals(item.getId())).collect(Collectors.toList());

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

@@ -1,12 +1,17 @@
 package cn.cslg.report.service.business;
 
 import cn.cslg.report.common.utils.Response;
+import cn.cslg.report.common.utils.SystemFileToReportFile;
 import cn.cslg.report.entity.ReviewHistory;
 import cn.cslg.report.entity.ReportFiles;
 
+import cn.cslg.report.entity.SystemFile;
 import cn.cslg.report.entity.asso.AssoReviewHisFile;
 import cn.cslg.report.mapper.ReviewHistoryMapper;
 
+import cn.cslg.report.service.file.FileManagerService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,108 +32,125 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 @SuppressWarnings({"all"})
 public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, ReviewHistory> {
-private final   ReportFileService reportFileService;
-private final AssoReviewHisFileService assoReviewHisFileService;
+    private final ReportFileService reportFileService;
+    private final AssoReviewHisFileService assoReviewHisFileService;
+    private final FileManagerService fileManagerService;
 
     /**
-     * @function 删除审查历史
      * @param id
      * @return
      * @throws IOException
+     * @function 删除审查历史
      */
     public String deleteReviewHistory(int id) throws IOException {
-        ReviewHistory ReviewHistory =this.getById(id);
-        this.removeById(id);
-        LambdaQueryWrapper<AssoReviewHisFile> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(AssoReviewHisFile::getReviewHistoryId,ReviewHistory.getId());
-        List<AssoReviewHisFile> assoes= assoReviewHisFileService.list(wrapper);
-        List<Integer> fileIds =assoes.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
-        //对应的文件也要删除
-        reportFileService.removeByIds(fileIds);
-        //对比方案与对比记录关联表 也要删除
-        assoReviewHisFileService.remove(wrapper);
+        ReviewHistory ReviewHistory = this.getById(id);
+        //this.removeById(id);
+        LambdaQueryWrapper<AssoReviewHisFile> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AssoReviewHisFile::getReviewHistoryId, ReviewHistory.getId());
+        List<AssoReviewHisFile> assoes = assoReviewHisFileService.list(wrapper);
+        if (assoes != null && assoes.size() > 0) {
+            List<Integer> fileIds = assoes.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
+            //对应的文件也要删除
+            //reportFileService.removeByIds(fileIds);
+            fileManagerService.deleteFileFromFMS(fileIds);
+            //对比方案与对比记录关联表 也要删除
+            assoReviewHisFileService.remove(wrapper);
+        }
         this.removeById(id);
         return Response.success();
     }
 
     /**
-     * @function 修改审查历史
      * @param reviewHistory 审查历史
-     * @param files 文件
+     * @param files         文件
      * @return
+     * @function 修改审查历史
      */
-    public Boolean updateReviewHistory(ReviewHistory reviewHistory,List<MultipartFile> files)  {
+    public Boolean updateReviewHistory(ReviewHistory reviewHistory, List<MultipartFile> files) throws IOException {
         // 根据无效Id查询对应的附件Id
-        LambdaQueryWrapper<AssoReviewHisFile> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(AssoReviewHisFile::getReviewHistoryId,reviewHistory.getId());
-        List<AssoReviewHisFile> assoes= assoReviewHisFileService.list(wrapper);
-        List<Integer> fileIds =assoes.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
-        // 获得更新后的附件Id
-        List<Integer> updateFileId =new ArrayList<>();
-        if(reviewHistory.getReportFiles()!=null){
-            updateFileId = reviewHistory.getReportFiles().stream().map(ReportFiles::getId).collect(Collectors.toList());
-            fileIds.removeAll(updateFileId);}
-        //做差获得被删除的文件Id
-        if(fileIds.size()!=0){
-            //根据文件Id删除报告文件关联表记录
-            LambdaQueryWrapper<AssoReviewHisFile> deleteWrapper = new LambdaQueryWrapper<>();
-            deleteWrapper.in(AssoReviewHisFile::getFileId,fileIds);
-            assoReviewHisFileService.remove(deleteWrapper);
-            //根据文件Id删除文件表记录
-            reportFileService.removeByIds(fileIds);
+        LambdaQueryWrapper<AssoReviewHisFile> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AssoReviewHisFile::getReviewHistoryId, reviewHistory.getId());
+        List<AssoReviewHisFile> assoes = assoReviewHisFileService.list(wrapper);
+        if (assoes != null && assoes.size() > 0) {
+            List<Integer> fileIds = assoes.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
+            // 获得更新后的附件Id
+            List<Integer> updateFileId = new ArrayList<>();
+            if (reviewHistory.getReportFiles() != null) {
+                updateFileId = reviewHistory.getReportFiles().stream().map(ReportFiles::getId).collect(Collectors.toList());
+                fileIds.removeAll(updateFileId);
+            }
+            //做差获得被删除的文件Id
+            if (fileIds.size() != 0) {
+                //根据文件Id删除报告文件关联表记录
+                LambdaQueryWrapper<AssoReviewHisFile> deleteWrapper = new LambdaQueryWrapper<>();
+                deleteWrapper.in(AssoReviewHisFile::getFileId, fileIds);
+                assoReviewHisFileService.remove(deleteWrapper);
+                //根据文件Id删除文件表记录
+                //reportFileService.removeByIds(fileIds);
+                fileManagerService.deleteFileFromFMS(fileIds);
+            }
         }
-          //添加附件
-        if (files!=null&&files.size() != 0) {
+
+        //添加附件
+        if (files != null && files.size() != 0) {
             //将文档上传并返回文件入库的Id
-            List<Integer> fileIdList = reportFileService.uploadFiles(files);
+            //List<Integer> fileIdList = reportFileService.uploadFiles(files);
+            //fileManagerService.uploadFile(files);
+            String res = fileManagerService.uploadFile(files);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            List<Integer> fileIdList = JSONArray.parseArray(jsonObject.get("data").toString(), Integer.class);
             assoReviewHisFileService.addAsso(reviewHistory.getId(), fileIdList);
 
         }
         return reviewHistory.updateById();
     }
+
     /**
-     * @function 增加审查历史
      * @param reviewHistory 审查历史
-     * @param files 文件
+     * @param files         文件
      * @return
+     * @function 增加审查历史
      */
-    public String addReviewHistory(ReviewHistory reviewHistory,List<MultipartFile> files) throws IOException {
+    public String addReviewHistory(ReviewHistory reviewHistory, List<MultipartFile> files) throws IOException {
         reviewHistory.insert();
-        if (files!=null&&files.size() != 0) {
+        if (files != null && files.size() != 0) {
             //将文档上传并返回文件入库的Id
-            List<Integer> fileIds = reportFileService.uploadFiles(files);
+            //List<Integer> fileIds = reportFileService.uploadFiles(files);
+            String res = fileManagerService.uploadFile(files);
+            JSONObject jsonObject = JSONObject.parseObject(res);
+            List<Integer> fileIds = JSONArray.parseArray(jsonObject.get("data").toString(), Integer.class);
             //对比方案与对比记录关联表 增加
-            assoReviewHisFileService.addAsso(reviewHistory.getId(),fileIds);
+            assoReviewHisFileService.addAsso(reviewHistory.getId(), fileIds);
         }
         return Response.success();
     }
 
     /**
-     * @function 根据专利号查询审查历史（分页）
      * @param reviewHistory
      * @return
+     * @function 根据专利号查询审查历史（分页）
      */
-    public String queryReviewHistory(ReviewHistory reviewHistory){
-        LambdaQueryWrapper<ReviewHistory> wrapper =new LambdaQueryWrapper<>();
-        wrapper.eq(ReviewHistory::getPatentNo,reviewHistory.getPatentNo());
+    public String queryReviewHistory(ReviewHistory reviewHistory) throws IOException {
+        LambdaQueryWrapper<ReviewHistory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ReviewHistory::getPatentNo, reviewHistory.getPatentNo());
         if (reviewHistory.getSize() != null && reviewHistory.getCurrent() != null) {
             IPage<ReviewHistory> pages = this.page(new Page<>(reviewHistory.getCurrent(), reviewHistory.getSize()), wrapper);
             pages.setRecords(this.thisReviewHistory(pages.getRecords()));
             return Response.success(pages);
         } else {
-            List<ReviewHistory> reviewHistories= this.list(wrapper);
-            reviewHistories =thisReviewHistory(reviewHistories);
+            List<ReviewHistory> reviewHistories = this.list(wrapper);
+            reviewHistories = thisReviewHistory(reviewHistories);
             return Response.success(reviewHistories);
         }
     }
 
     /**
-     * @function:装载无效记录
      * @param reviewHistories
      * @return
+     * @function:装载无效记录
      */
 
-    public List<ReviewHistory> thisReviewHistory(List<ReviewHistory> reviewHistories) {
+    public List<ReviewHistory> thisReviewHistory(List<ReviewHistory> reviewHistories) throws IOException {
         //获得无效记录的Id
         List<Integer> ids = reviewHistories.stream().map(ReviewHistory::getId).collect(Collectors.toList());
         if (ids.size() != 0) {
@@ -139,17 +161,25 @@ private final AssoReviewHisFileService assoReviewHisFileService;
             //根据关联信息查询附件信息
             if (assoReviewHistoryFiles.size() != 0) {
                 List<Integer> fileIds = assoReviewHistoryFiles.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
-                LambdaQueryWrapper<ReportFiles> wrapper = new LambdaQueryWrapper<>();
-                wrapper.in(ReportFiles::getId, fileIds);
-                List<ReportFiles> reportFiles = reportFileService.list(wrapper);
+//                LambdaQueryWrapper<ReportFiles> wrapper = new LambdaQueryWrapper<>();
+//                wrapper.in(ReportFiles::getId, fileIds);
+//                List<ReportFiles> reportFiles = reportFileService.list(wrapper);
+                String res = fileManagerService.getSystemFileFromFMS(fileIds);
+                List<SystemFile> systemFiles = JSONArray.parseArray(res, SystemFile.class);
                 //遍历装载文件信息
                 reviewHistories.forEach(item -> {
                     List<AssoReviewHisFile> partAsso = assoReviewHistoryFiles.stream().filter(tem -> tem.getReviewHistoryId().equals(item.getId())).collect(Collectors.toList());
                     List<ReportFiles> reportFilesList = new ArrayList<>();
                     if (partAsso.size() != 0) {
                         List<Integer> partFileIds = partAsso.stream().map(AssoReviewHisFile::getFileId).collect(Collectors.toList());
-                        List<ReportFiles> reportFiles1 = reportFiles.stream().filter(tem -> partFileIds.contains(tem.getId())).collect(Collectors.toList());
-                        reportFilesList = reportFiles1;
+//                        List<ReportFiles> reportFiles1 = reportFiles.stream().filter(tem -> partFileIds.contains(tem.getId())).collect(Collectors.toList());
+//                        reportFilesList = reportFiles1;
+                        List<SystemFile> systemFiles1 = systemFiles.stream().filter(tem -> partFileIds.contains(tem.getId())).collect(Collectors.toList());
+                        systemFiles1.forEach(systemFile -> {
+                            ReportFiles reportFile = new ReportFiles();
+                            SystemFileToReportFile.systemFileToReportFile(systemFile, reportFile);
+                            reportFilesList.add(reportFile);
+                        });
                     }
                     item.setReportFiles(reportFilesList);
                 });

RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java

@@ -257,20 +257,15 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> {
         ProductIncludeFilesVO queryResult = this.getProduct(reportId);
         if (queryResult != null) {
             Integer productId = queryResult.getId();
-            assoProductFileService.deleteAssoByProductId(productId);
-            //2.根据附件fileId集合删除报告系统文件表数据：先从产品关联附件的数据中取出附件数据，遍历附件取出附件fileId存入集合
-            List<ReportFileStandardVO> reportFiles = queryResult.getReportFiles();
-            ArrayList<Integer> list = new ArrayList<>();
-            for (ReportFileStandardVO reportFile : reportFiles) {
-                Integer fileId = reportFile.getId();
-                list.add(fileId);
+            List<AssoProductFile> assoProductFiles = assoProductFileService.list(new LambdaQueryWrapper<AssoProductFile>().eq(AssoProductFile::getProductId, productId));
+            if (assoProductFiles != null && assoProductFiles.size() > 0) {
+                assoProductFileService.deleteAssoByProductId(productId);
+                List<Integer> fileIds = assoProductFiles.stream().map(AssoProductFile::getFileId).collect(Collectors.toList());
+                fileManagerService.deleteFileFromFMS(fileIds);
             }
-            reportFileService.deleteFiles(list);
             //3.根据报告reportId删除产品表数据
             productMapper.deleteByReportId(reportId);
             log.info("产品删除完成");
-        } else {
-            log.info("删除产品失败，产品不存在");
         }
 
     }