From cdcc34e5b47017560cc06ce86e460404af0f3d43 Mon Sep 17 00:00:00 2001 From: linrf Date: Wed, 30 Aug 2023 15:40:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0bug=20id=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/OcrFileInfoTestConvert.java | 20 ++--- .../service/IOcrFileInfoTestService.java | 2 + .../server/service/impl/CommonService.java | 75 ++++++++++++++----- .../service/impl/OcrFileInfoServiceImpl.java | 3 +- .../impl/OcrFileInfoTestServiceImpl.java | 11 +++ 5 files changed, 81 insertions(+), 30 deletions(-) diff --git a/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java b/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java index d7f1f8a..be4a2d8 100644 --- a/docus-segmentation/src/main/java/com/docus/server/convert/OcrFileInfoTestConvert.java +++ b/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 convertVO(PageResult pageResult); + + @Mappings({}) + List convertDO(List files); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java b/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java index f21fd97..e2fc522 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java +++ b/docus-segmentation/src/main/java/com/docus/server/service/IOcrFileInfoTestService.java @@ -62,4 +62,6 @@ public interface IOcrFileInfoTestService { * @return 分页列表 */ PageResult search(SearchDTO searchDTO); + + void addBatch(List files); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java index f1235e7..0419a93 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/CommonService.java +++ b/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 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 files = new ArrayList<>(); - List 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 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); } } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java index 29d71cc..12f58a9 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoServiceImpl.java +++ b/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 files) { List ocrFileInfos = OcrFileInfoConvert.INSTANCE.convertDO(files); - long id = idService.getDateSeq(); ocrFileInfos.forEach(p -> { - p.setId(id); + p.setId(idService.getDateSeq()); }); iOcrFileInfoDao.saveBatch(ocrFileInfos, 500); } diff --git a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java b/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java index 4e83025..76878a5 100644 --- a/docus-segmentation/src/main/java/com/docus/server/service/impl/OcrFileInfoTestServiceImpl.java +++ b/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 files) { + List ocrFileInfos = OcrFileInfoTestConvert.INSTANCE.convertDO(files); + ocrFileInfos.forEach(p -> { + p.setId(idService.getDateSeq()); + }); + iOcrFileInfoTestDao.saveBatch(ocrFileInfos, 500); + } + + /** * 新增 *