上传部分 2022/12/6

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

@@ -4,8 +4,10 @@ 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;
 import lombok.RequiredArgsConstructor;
@@ -25,14 +27,15 @@ public class InvalidRecordController {
     public final InvalidRecordService invalidRecordService;
     @RequestMapping(value = "/addInvalidRecord", method = RequestMethod.POST)
     @Operation(summary = "增加无效记录")
-    public  String addInvalidRecord(InvalidRecord invalidRecord, List<MultipartFile> file) throws IOException{
-
-        return invalidRecordService.addInvalidRecord(invalidRecord,file);
+    public  String addInvalidRecord(String jsons, List<MultipartFile> files) throws IOException{
+        InvalidRecord invalidRecord = JSONObject.parseObject(jsons,InvalidRecord.class);
+        return invalidRecordService.addInvalidRecord(invalidRecord,files);
     }
     @RequestMapping(value = "/updateInvalidRecord", method = RequestMethod.POST)
     @Operation(summary = "修改无效记录")
     @Transactional(rollbackFor = Exception.class)
-    public String updateInvalidRecord( InvalidRecord invalidRecord, List<MultipartFile> files)throws IOException{
+    public String updateInvalidRecord( String jsons, List<MultipartFile> files)throws IOException{
+        InvalidRecord invalidRecord = JSONObject.parseObject(jsons,InvalidRecord.class);
       Boolean flag=  invalidRecordService.updateInvalidRecord(invalidRecord,files);
       if(flag) {
           return Response.success();

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

@@ -3,7 +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.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;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -28,13 +30,15 @@ public class LitigationHistoryController {
     }
     @PostMapping(value = "/addLitigationHistory")
     @Operation(summary = "增加诉讼历史")
-    public String addLitigationHistory( LitigationHistory litigationHistory, List<MultipartFile> files)throws IOException{
+    public String addLitigationHistory( String jsons, List<MultipartFile> files)throws IOException{
+        LitigationHistory litigationHistory = JSONObject.parseObject(jsons,LitigationHistory.class);
         return litigationHistoryService.addLitigationHistory(litigationHistory,files);
     }
     @PostMapping(value = "/updateLitigationHistory")
     @Operation(summary = "修改诉讼历史")
     @Transactional(rollbackFor = Exception.class)
-    public String updateLitigationHistory( LitigationHistory litigationHistory,List<MultipartFile> files)throws IOException{
+    public String updateLitigationHistory( String jsons,List<MultipartFile> files)throws IOException{
+        LitigationHistory litigationHistory = JSONObject.parseObject(jsons,LitigationHistory.class);
         Boolean flag = litigationHistoryService.updateLitigationHistory(litigationHistory,files);
         if(flag){
             return Response.success();

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

@@ -2,8 +2,10 @@ 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.References;
 import cn.cslg.report.service.business.ReferencesService;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -23,13 +25,15 @@ public class ReferencesController {
     public final ReferencesService referencesService;
     @RequestMapping(value = "/addReferences", method = RequestMethod.POST)
     @Operation(summary = "增加参考资料")
-    public  String addReferences( References references, List<MultipartFile> files) throws IOException{
+    public  String addReferences( String jsons, List<MultipartFile> files) throws IOException{
+        References references = JSONObject.parseObject(jsons,References.class);
         return referencesService.addReferences(references,files);
     }
     @RequestMapping(value = "/updateReferences", method = RequestMethod.POST)
     @Operation(summary = "修改参考资料")
     @Transactional(rollbackFor = Exception.class)
-    public String updateReferences( @RequestBody References references, List<MultipartFile> files)throws IOException{
+    public String updateReferences( String jsons, List<MultipartFile> files)throws IOException{
+        References references = JSONObject.parseObject(jsons,References.class);
         Boolean flag=referencesService.updateReferences(references,files);
         if (flag) {
             return Response.success();

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

@@ -2,9 +2,11 @@ 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;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -25,14 +27,16 @@ public class ReviewHistoryController {
 
     @RequestMapping(value = "/addReviewHistory", method = RequestMethod.POST)
     @Operation(summary = "增加审查历史")
-    public String addReviewHistory(ReviewHistory reviewHistory, List<MultipartFile> files) throws IOException {
+    public String addReviewHistory(String jsons, List<MultipartFile> files) throws IOException {
+        ReviewHistory reviewHistory = JSONObject.parseObject(jsons,ReviewHistory.class);
         return reviewHistoryService.addReviewHistory(reviewHistory, files);
     }
 
     @RequestMapping(value = "/updateReviewHistory", method = RequestMethod.POST)
     @Operation(summary = "修改审查历史")
     @Transactional(rollbackFor = Exception.class)
-    public String updateReviewHistory(ReviewHistory reviewHistory, List<MultipartFile> files) throws IOException {
+    public String updateReviewHistory(String jsons, List<MultipartFile> files) throws IOException {
+        ReviewHistory reviewHistory = JSONObject.parseObject(jsons,ReviewHistory.class);
         Boolean flag = reviewHistoryService.updateReviewHistory(reviewHistory, files);
         if (flag) {
             return Response.success();

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

@@ -118,6 +118,16 @@ public class TaskController {
         return Response.success(importTask );
     }
 
+    @RequestMapping(value = "/import/delete", method = RequestMethod.GET)
+    @Operation(summary = "删除导入记录")
+    public String importPatent(int id) throws ParseException, IOException {
+     Boolean flag =  importTaskService.delImportTask(id);
+     if(flag) {
+     return  Response.success();
+     }
+        return Response.error();
+    }
+
     @RequestMapping(value = "/reImportTask", method = RequestMethod.POST)
     @Operation(summary = "根据报告Id和状态返回导入任务列表")
     public String reImportTask(@RequestBody ImportTask importTask) {

RMS/src/main/java/cn/cslg/report/service/BaseService.java

@@ -266,7 +266,7 @@ public class BaseService {
         importTask.setState(0);
         importTask.setCreateUserId(personnelVO.getId());
         importTask.setCreateUserName(personnelVO.getName());
-        importTask.setFilePath(path);
+        importTask.setFilePath(fileDTO.getPath());
         importTask.setTaskName(file.getOriginalFilename());
         importTask.insert();
         return importTask;
@@ -278,7 +278,7 @@ public class BaseService {
         Integer total =importTask.getImportCount();
         List<List<Object>> fileHead =new ArrayList<>();
         //解析excel文件并保存进map里
-        ExcelUtil.readBySax(importTask.getFilePath(), -1, (sheetIndex, rowIndex, row) ->
+        ExcelUtil.readBySax(fileUtils.getSystemPath()+importTask.getFilePath(), -1, (sheetIndex, rowIndex, row) ->
                 { if(rowIndex==0)
                 { fileHead.add(row);}
                 else {
@@ -286,7 +286,7 @@ public class BaseService {
                     List<Map<Object, Object>> mapList = new ArrayList<>();
                     mapList.add(IterUtil.toMap(fileHead.get(0),row));
                     TaskParams taskParams = new TaskParams();
-                    taskParams.setPath(importTask.getFilePath());
+                    taskParams.setPath(fileUtils.getSystemPath()+importTask.getFilePath());
                     taskParams.setTaskType(1);
                     taskParams.setOldName(importTask.getTaskName());
                     taskParams.setTotal(importTask.getImportCount());

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

@@ -33,13 +33,17 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             queryWrapper.eq(ImportTask::getState, importTask.getState());
         }
         queryWrapper.orderByDesc(ImportTask::getCreateDate);
-        if(importTask.getCurrent()!=null&&importTask.getSize()!=null){
-        IPage<ImportTask> importTaskIPage = this.page(new Page<>(importTask.getCurrent(),importTask.getSize()),queryWrapper);
+        if (importTask.getCurrent() != null && importTask.getSize() != null) {
+            IPage<ImportTask> importTaskIPage = this.page(new Page<>(importTask.getCurrent(), importTask.getSize()), queryWrapper);
             return Response.success(importTaskIPage);
         }
-         return Response.success(this.list(queryWrapper));
+        return Response.success(this.list(queryWrapper));
 
 
     }
 
-}
+    public Boolean delImportTask(Integer id) {
+        Boolean flag = this.removeById(id);
+        return flag;
+    }
+}

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

@@ -14,6 +14,7 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -72,9 +73,10 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         return invalidRecord.updateById();
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public String addInvalidRecord(InvalidRecord invalidRecord, List<MultipartFile> files) throws IOException {
         invalidRecord.insert();
-        if (files == null && files.size() != 0) {
+        if (files != null && files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIds = reportFileService.uploadFiles(files);
             assoInvalidRecordFileService.addAsso(invalidRecord.getId(), fileIds);

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

@@ -41,7 +41,7 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
 
     public String addLitigationHistory(LitigationHistory litigationHistory,List<MultipartFile> files){
         litigationHistory.insert();
-        if (files==null&&files.size() != 0) {
+        if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIds = reportFileService.uploadFiles(files);
             assoLitigationHisFileService.addAsso(litigationHistory.getId(),fileIds);

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

@@ -75,7 +75,7 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
 
     public String addReferences(References references,List<MultipartFile> files) throws IOException {
         references.insert();
-        if (files==null&&files.size() != 0) {
+        if (files!=null&&files.size() != 0) {
             //将文档上传并返回文件入库的Id
             List<Integer> fileIds = reportFileService.uploadFiles(files);
             assoReferenceFileService.addAsso(references.getId(),fileIds);

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

@@ -75,7 +75,7 @@ private final AssoReviewHisFileService assoReviewHisFileService;
 
     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);
             assoReviewHisFileService.addAsso(reviewHistory.getId(),fileIds);

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

@@ -3283,9 +3283,9 @@
 [rms:0.0.0.0:8885] [,] 2022-11-29 14:07:55.389 DEBUG 8680 [http-nio-8885-exec-2] cn.cslg.report.mapper.LitigationHistoryMapper.selectPage_mpCount ==>  Preparing: SELECT COUNT(*) AS total FROM LITIGATION_HISTORY WHERE (PATENT_NO = ?)
 [rms:0.0.0.0:8885] [,] 2022-11-29 14:07:55.389 DEBUG 8680 [http-nio-8885-exec-2] cn.cslg.report.mapper.LitigationHistoryMapper.selectPage_mpCount ==> Parameters: CN208096006U(String)
 [rms:0.0.0.0:8885] [,] 2022-11-29 14:07:55.407 DEBUG 8680 [http-nio-8885-exec-2] cn.cslg.report.mapper.LitigationHistoryMapper.selectPage_mpCount <==      Total: 1
-[rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.322 DEBUG 8680 [http-nio-8885-exec-7] cn.cslg.report.mapper.InvalidRecordMapper.selectPage_mpCount ==>  Preparing: SELECT COUNT(*) AS total FROM INVALID_RECORD WHERE (PATENT_NO = ?)
-[rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.322 DEBUG 8680 [http-nio-8885-exec-7] cn.cslg.report.mapper.InvalidRecordMapper.selectPage_mpCount ==> Parameters: CN208096006U(String)
-[rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.341 DEBUG 8680 [http-nio-8885-exec-7] cn.cslg.report.mapper.InvalidRecordMapper.selectPage_mpCount <==      Total: 1
+[rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.322 DEBUG 8680 [http-nio-8885-exec-7] cn.cslg.report.mapper.ReviewHistoryMapper.selectPage_mpCount ==>  Preparing: SELECT COUNT(*) AS total FROM INVALID_RECORD WHERE (PATENT_NO = ?)
+[rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.322 DEBUG 8680 [http-nio-8885-exec-7] cn.cslg.report.mapper.ReviewHistoryMapper.selectPage_mpCount ==> Parameters: CN208096006U(String)
+[rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.341 DEBUG 8680 [http-nio-8885-exec-7] cn.cslg.report.mapper.ReviewHistoryMapper.selectPage_mpCount <==      Total: 1
 [rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.590 DEBUG 8680 [http-nio-8885-exec-5] cn.cslg.report.mapper.ReviewHistoryMapper.selectPage_mpCount ==>  Preparing: SELECT COUNT(*) AS total FROM REVIEW_HISTORY WHERE (PATENT_NO = ?)
 [rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.590 DEBUG 8680 [http-nio-8885-exec-5] cn.cslg.report.mapper.ReviewHistoryMapper.selectPage_mpCount ==> Parameters: CN208096006U(String)
 [rms:0.0.0.0:8885] [,] 2022-11-29 14:07:56.608 DEBUG 8680 [http-nio-8885-exec-5] cn.cslg.report.mapper.ReviewHistoryMapper.selectPage_mpCount <==      Total: 1