修改文件上传bug id重复

docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java

@@ -1,12 +1,10 @@
 package com.docus.server.convert;
 
 import com.docus.infrastructure.web.response.PageResult;
+import com.docus.server.dto.segmentation.ocrfileinfotest.AddOcrFileInfoTestDTO;
+import com.docus.server.dto.segmentation.ocrfileinfotest.EditOcrFileInfoTestDTO;
 import com.docus.server.entity.segmentation.OcrFileInfoTest;
-    import com.docus.server.dto.segmentation.ocrfileinfotest.AddOcrFileInfoTestDTO;
-    import com.docus.server.dto.segmentation.ocrfileinfotest.EditOcrFileInfoTestDTO;
-    import com.docus.server.dto.segmentation.ocrfileinfotest.DeleteOcrFileInfoTestDTO;
 import com.docus.server.vo.segmentation.ocrfileinfotest.OcrFileInfoTestVO;
-
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;
@@ -14,12 +12,11 @@ import org.mapstruct.factory.Mappers;
 import java.util.List;
 
 /**
-*
-* ocr文件信息-调试 服务转换器
-*
-* @author AutoGenerator
-* @since 2023-08-29
-*/
+ * ocr文件信息-调试 服务转换器
+ *
+ * @author AutoGenerator
+ * @since 2023-08-29
+ */
 @Mapper
 public interface OcrFileInfoTestConvert {
 
@@ -45,5 +42,8 @@ public interface OcrFileInfoTestConvert {
 
     @Mappings({})
     PageResult<OcrFileInfoTestVO> convertVO(PageResult<OcrFileInfoTest> pageResult);
+
+    @Mappings({})
+    List<OcrFileInfoTest> convertDO(List<AddOcrFileInfoTestDTO> files);
 }
 

docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java

@@ -62,4 +62,6 @@ public interface IOcrFileInfoTestService {
      * @return 分页列表
      */
     PageResult<OcrFileInfoTestVO> search(SearchDTO searchDTO);
+
+    void addBatch(List<AddOcrFileInfoTestDTO> files);
 }

docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java

@@ -2,9 +2,13 @@ package com.docus.server.service.impl;
 
 import com.docus.server.dto.segmentation.UploadBatchFileRequest;
 import com.docus.server.dto.segmentation.ocrbasic.AddOcrBasicDTO;
+import com.docus.server.dto.segmentation.ocrbasictest.AddOcrBasicTestDTO;
 import com.docus.server.dto.segmentation.ocrfileinfo.AddOcrFileInfoDTO;
+import com.docus.server.dto.segmentation.ocrfileinfotest.AddOcrFileInfoTestDTO;
 import com.docus.server.service.IOcrBasicService;
+import com.docus.server.service.IOcrBasicTestService;
 import com.docus.server.service.IOcrFileInfoService;
+import com.docus.server.service.IOcrFileInfoTestService;
 import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,36 +25,71 @@ public class CommonService {
     @Resource
     private IOcrFileInfoService iOcrFileInfoService;
 
+    @Resource
+    private IOcrBasicTestService iOcrBasicTestService;
+    @Resource
+    private IOcrFileInfoTestService iOcrFileInfoTestService;
+
     @Transactional(rollbackFor = Exception.class)
     public void add(List<UploadFileVO> segmentation, UploadBatchFileRequest request) {
+        //test
+        if (request.getTestData() == 1) {
+            AddOcrBasicTestDTO addOcrBasicDTO = new AddOcrBasicTestDTO();
 
-        AddOcrBasicDTO addOcrBasicDTO = new AddOcrBasicDTO();
+            addOcrBasicDTO.setPatientId(request.getPatientId());
+            addOcrBasicDTO.setInpatientNo(request.getInpatientNo());
+            addOcrBasicDTO.setName(request.getName());
 
-        addOcrBasicDTO.setPatientId(request.getPatientId());
-        addOcrBasicDTO.setInpatientNo(request.getInpatientNo());
-        addOcrBasicDTO.setName(request.getName());
 
+            iOcrBasicTestService.add(addOcrBasicDTO);
 
-        iOcrBasicService.add(addOcrBasicDTO);
 
+            AddOcrFileInfoTestDTO addOcrFileInfoDTO = new AddOcrFileInfoTestDTO();
 
-        AddOcrFileInfoDTO addOcrFileInfoDTO = new AddOcrFileInfoDTO();
+            List<AddOcrFileInfoTestDTO> files = new ArrayList<>();
 
-        List<AddOcrFileInfoDTO> files = new ArrayList<>();
+            for (UploadFileVO uploadFileVO : segmentation) {
+                addOcrFileInfoDTO.setPatientId(request.getPatientId());
+                addOcrFileInfoDTO.setFileTitle(uploadFileVO.getFileTitle());
+                addOcrFileInfoDTO.setPicName(uploadFileVO.getFileName());
+                addOcrFileInfoDTO.setFileType(2);
+                addOcrFileInfoDTO.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
+                addOcrFileInfoDTO.setPicUrl(uploadFileVO.getSaveFilePath() + uploadFileVO.getFilePath());
+                addOcrFileInfoDTO.setPicCutUrl(uploadFileVO.getSaveCutFilePath() + uploadFileVO.getFilePath());
+                files.add(addOcrFileInfoDTO);
+            }
 
-        for (UploadFileVO uploadFileVO : segmentation) {
-            addOcrFileInfoDTO.setPatientId(request.getPatientId());
-            addOcrFileInfoDTO.setFileTitle(uploadFileVO.getFileTitle());
-            addOcrFileInfoDTO.setPicName(uploadFileVO.getFileName());
-            addOcrFileInfoDTO.setFileType(2);
-            addOcrFileInfoDTO.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
-            addOcrFileInfoDTO.setPicUrl(uploadFileVO.getSaveFilePath() + uploadFileVO.getFilePath());
-            addOcrFileInfoDTO.setPicCutUrl(uploadFileVO.getSaveCutFilePath() + uploadFileVO.getFilePath());
-            files.add(addOcrFileInfoDTO);
-        }
 
+            iOcrFileInfoTestService.addBatch(files);
+
+        } else {
+            AddOcrBasicDTO addOcrBasicDTO = new AddOcrBasicDTO();
+
+            addOcrBasicDTO.setPatientId(request.getPatientId());
+            addOcrBasicDTO.setInpatientNo(request.getInpatientNo());
+            addOcrBasicDTO.setName(request.getName());
+
+            iOcrBasicService.add(addOcrBasicDTO);
+
+            AddOcrFileInfoDTO addOcrFileInfoDTO = new AddOcrFileInfoDTO();
+
+            List<AddOcrFileInfoDTO> files = new ArrayList<>();
+
+            for (UploadFileVO uploadFileVO : segmentation) {
+                addOcrFileInfoDTO.setPatientId(request.getPatientId());
+                addOcrFileInfoDTO.setFileTitle(uploadFileVO.getFileTitle());
+                addOcrFileInfoDTO.setPicName(uploadFileVO.getFileName());
+                addOcrFileInfoDTO.setFileType(2);
+                addOcrFileInfoDTO.setSerialNumber(UUID.randomUUID().toString().replace("-", ""));
+                addOcrFileInfoDTO.setPicUrl(uploadFileVO.getSaveFilePath() + uploadFileVO.getFilePath());
+                addOcrFileInfoDTO.setPicCutUrl(uploadFileVO.getSaveCutFilePath() + uploadFileVO.getFilePath());
+                files.add(addOcrFileInfoDTO);
+            }
+
+
+            iOcrFileInfoService.addBatch(files);
+        }
 
-        iOcrFileInfoService.addBatch(files);
 
     }
 }

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java

@@ -83,9 +83,8 @@ public class OcrFileInfoServiceImpl implements IOcrFileInfoService {
     @Override
     public void addBatch(List<AddOcrFileInfoDTO> files) {
         List<OcrFileInfo> ocrFileInfos = OcrFileInfoConvert.INSTANCE.convertDO(files);
-        long id = idService.getDateSeq();
         ocrFileInfos.forEach(p -> {
-            p.setId(id);
+            p.setId(idService.getDateSeq());
         });
         iOcrFileInfoDao.saveBatch(ocrFileInfos, 500);
     }

docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java

@@ -79,6 +79,17 @@ public class OcrFileInfoTestServiceImpl implements IOcrFileInfoTestService {
         //return result;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void addBatch(List<AddOcrFileInfoTestDTO> files) {
+        List<OcrFileInfoTest> ocrFileInfos = OcrFileInfoTestConvert.INSTANCE.convertDO(files);
+        ocrFileInfos.forEach(p -> {
+            p.setId(idService.getDateSeq());
+        });
+        iOcrFileInfoTestDao.saveBatch(ocrFileInfos, 500);
+    }
+
+
     /**
      * 新增
      *