删除 2022/12/9

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

@@ -3,15 +3,19 @@ package cn.cslg.report.controller;
 import cn.cslg.report.common.core.base.Constants;
 
 import cn.cslg.report.entity.CompareRecords;
+import cn.cslg.report.entity.InvalidRecord;
 import cn.cslg.report.service.business.CompareRecordsService;
+import com.alibaba.fastjson.JSONObject;
 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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 
 @Tag(name = "对比记录")
 @RestController
@@ -23,8 +27,9 @@ public class CompareRecordsController {
 
     @PostMapping(value = "/addCompareRecords")
     @Operation(summary = "增加对比记录数据")
-    public String addCompareRecords(@RequestBody CompareRecords compareRecords)throws IOException{
-        return compareRecordsService.addCompareRecord(compareRecords);
+    public String addCompareRecords(String jsons, List<MultipartFile> files)throws IOException{
+        CompareRecords compareRecords = JSONObject.parseObject(jsons,CompareRecords.class);
+        return compareRecordsService.addCompareRecord(compareRecords,files);
     }
     @RequestMapping(value = "/deleCompareRecords", method = RequestMethod.GET)
     @Operation(summary = "删除对比记录数据")
@@ -35,13 +40,15 @@ public class CompareRecordsController {
     @PostMapping(value = "/updateCompareRecords")
     @Operation(summary = "修改对比记录数据")
     @Transactional(rollbackFor = Exception.class)
-    public String updateCompareRecords(@RequestBody CompareRecords compareRecord) throws IOException{
-        return compareRecordsService.updateCompareRecords(compareRecord);
+    public String updateCompareRecords(String jsons, List<MultipartFile> files) throws IOException{
+        CompareRecords compareRecords = JSONObject.parseObject(jsons,CompareRecords.class);
+        return compareRecordsService.updateCompareRecords(compareRecords,files);
 
     }
     @PostMapping(value = "/selectCompareRecord")
     @Operation(summary ="查询对比记录")
     public String getCompareRecords(@RequestBody CompareRecords compareRecord)throws IOException{
+
       return compareRecordsService.getCompareRecords(compareRecord);
     }
 

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

@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 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;
@@ -35,9 +36,15 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
     public final FeatureService featureService;
     public final AssoRecordsFeatureService assoRecordsFeatureService;
     public final CompareFilesService compareFilesService;
+    private final ReportFileService reportFileService;
 
     @Transactional(rollbackFor = Exception.class)
-    public String addCompareRecord(CompareRecords compareRecord) throws IOException {
+    public String addCompareRecord(CompareRecords compareRecord,List<MultipartFile> files) throws IOException {
+        if (files != null && files.size() != 0) {
+            //将文档上传并返回文件入库的Id
+            List<String> fileNames = reportFileService.uploadFilesGetName(files);
+            compareRecord.setFilePath(fileNames.get(0));
+        }
         compareRecord.insert();
         //对比方案与对比记录关联表对比文件添加
         List<AssoRecordsFeature> assoRecordsFeatures = compareRecord.getAssoRecordsFeatures();
@@ -59,13 +66,19 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public String updateCompareRecords(CompareRecords compareRecord) throws IOException {
+    public String updateCompareRecords(CompareRecords compareRecord,List<MultipartFile> files) throws IOException {
+        if (files != null && files.size() != 0) {
+            //将文档上传并返回文件入库的Id
+            List<String> fileNames = reportFileService.uploadFilesGetName(files);
+            compareRecord.setFilePath(fileNames.get(0));
+        }
         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);
+        compareRecord.updateById();
         return Response.success();
     }
     /**

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

@@ -199,6 +199,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
              compareContent =patentNo+":"+content+"("+paresingProcess+")";
                 //获取对比专利号
                 map.put("compareContent", compareContent);
+                map.put("figure",record.getFilePath());
                 maps.add(map);
             });
             //方案内容

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

@@ -50,6 +50,26 @@ public class ReportFileService extends ServiceImpl<ReportFileMapper, ReportFiles
 
 
     }
+    //上传文档
+    public List<String> uploadFilesGetName(List<MultipartFile> file){
+        List<ReportFiles> reportFiles =new ArrayList<>();
+        file.forEach(item->{
+            UploadFileDTO fileDTO = fileUtils.uploadFile(item);
+            ReportFiles reportFile =new ReportFiles();
+            reportFile.setSize((int) item.getSize());
+            reportFile.setUrl(fileDTO.getPath());
+            reportFile.setFileName(fileDTO.getFileName());
+            reportFile.setName(fileDTO.getName());
+            reportFile.setCreateBy(loginUtils.getId());
+            reportFile.setSuffix(fileDTO.getExtName());
+            reportFiles.add(reportFile);
+        });
+        this.saveBatch(reportFiles);
+        List<String> urls= reportFiles.stream().map(ReportFiles::getUrl).collect(Collectors.toList());
+        return urls;
+
+
+    }
 
     //删除文件
     public void deleteFiles(List<Integer> fileIds)