获取单据结果修改

src/main/java/cn/com/poc/ai_data_audit/dto/BizAiDataAuditTaskDto.java

-package cn.com.poc.ai_data_audit.dto;	
+package cn.com.poc.ai_data_audit.dto;
 
 
+import cn.com.poc.ai_data_audit.entity.BizAiDataAuditFileEntity;
+
+import java.util.List;
+
 public class BizAiDataAuditTaskDto {
 
     private static final long serialVersionUID = 1L;
@@ -148,4 +152,14 @@ public class BizAiDataAuditTaskDto {
     public void setSysVersion(java.lang.Integer sysVersion){
         this.sysVersion = sysVersion;
     }
+
+    private List<BizAiDataAuditFileDto> bizAiDataAuditFileDtoList;
+
+    public List<BizAiDataAuditFileDto> getBizAiDataAuditFileDtoList() {
+        return bizAiDataAuditFileDtoList;
+    }
+
+    public void setBizAiDataAuditFileDtoList(List<BizAiDataAuditFileDto> bizAiDataAuditFileDtoList) {
+        this.bizAiDataAuditFileDtoList = bizAiDataAuditFileDtoList;
+    }
 }
\ No newline at end of file

src/main/java/cn/com/poc/ai_data_audit/dto/FileUploadConfirmDto.java

@@ -11,7 +11,6 @@ import java.util.List;
  */
 public class FileUploadConfirmDto {
 
-//    private List<MultipartFile> multipartFileList;
 
     //上传的文件
     private List<FileUploadDto> fileUploadDtoList;
@@ -19,15 +18,6 @@ public class FileUploadConfirmDto {
     //匹配的文件列表
     private List<FileUploadReturnDto> fileUploadReturnDtoList;
 
-//    public List<MultipartFile> getMultipartFileList() {
-//        return multipartFileList;
-//    }
-//
-//    public void setMultipartFileList(List<MultipartFile> multipartFileList) {
-//        this.multipartFileList = multipartFileList;
-//    }
-
-
     public List<FileUploadDto> getFileUploadDtoList() {
         return fileUploadDtoList;
     }
@@ -41,6 +31,6 @@ public class FileUploadConfirmDto {
     }
 
     public void setFileUploadReturnDtoList(List<FileUploadReturnDto> fileUploadReturnDtoList) {
-        fileUploadReturnDtoList = fileUploadReturnDtoList;
+        this.fileUploadReturnDtoList = fileUploadReturnDtoList;
     }
 }

src/main/java/cn/com/poc/ai_data_audit/rest/impl/BizAiDataAuditTaskRestImpl.java

@@ -3,6 +3,10 @@ package cn.com.poc.ai_data_audit.rest.impl;
 import java.util.List;
 import javax.annotation.Resource;
 
+import cn.com.poc.ai_data_audit.convert.BizAiDataAuditFileConvert;
+import cn.com.poc.ai_data_audit.dto.BizAiDataAuditFileDto;
+import cn.com.poc.ai_data_audit.entity.BizAiDataAuditFileEntity;
+import cn.com.poc.ai_data_audit.service.BizAiDataAuditFileService;
 import cn.com.poc.common.utils.BlContext;
 import org.springframework.stereotype.Component;
 import cn.com.poc.ai_data_audit.rest.BizAiDataAuditTaskRest;
@@ -21,6 +25,9 @@ public class BizAiDataAuditTaskRestImpl implements BizAiDataAuditTaskRest {
     @Resource
     private BizAiDataAuditTaskService bizAiDataAuditTaskService;
 
+    @Resource
+    private BizAiDataAuditFileService bizAiDataAuditFileService;
+
     @Override
     public List<BizAiDataAuditTaskDto> getTaskList() throws Exception {
         BizAiDataAuditTaskEntity bizAiDataAuditTaskEntity = new BizAiDataAuditTaskEntity();
@@ -44,7 +51,17 @@ public class BizAiDataAuditTaskRestImpl implements BizAiDataAuditTaskRest {
         if (bizAiDataAuditTaskEntity == null) {
             throw new Exception("the task can not be found");
         }
-        return BizAiDataAuditTaskConvert.entityToDto(bizAiDataAuditTaskEntity);
+        BizAiDataAuditTaskDto bizAiDataAuditTaskDto = BizAiDataAuditTaskConvert.entityToDto(bizAiDataAuditTaskEntity);
+        BizAiDataAuditFileEntity entity = new BizAiDataAuditFileEntity();
+        entity.setTaskId(taskId);
+        List<BizAiDataAuditFileDto> bizAiDataAuditFileDtos = bizAiDataAuditFileService.findByExample(entity, null)
+                .stream()
+                .map(BizAiDataAuditFileConvert::entityToDto)
+                .collect(Collectors.toList());
+
+        bizAiDataAuditTaskDto.setBizAiDataAuditFileDtoList(bizAiDataAuditFileDtos);
+
+        return bizAiDataAuditTaskDto;
     }
 
     @Override

src/main/java/cn/com/poc/ai_data_audit/rest/impl/DataAuditRestImpl.java

@@ -33,9 +33,7 @@ public class DataAuditRestImpl implements DataAuditRest {
         if (CollectionUtils.isEmpty(fileUploadDtoList)) {
             throw new Exception("please upload files");
         }
-
         return dataAuditService.fileUploadAndProcessing(fileUploadDtoList);
-
     }
 
     @Override

src/main/java/cn/com/poc/ai_data_audit/service/impl/BizAiDataAuditFileServiceImpl.java

@@ -117,13 +117,10 @@ public class BizAiDataAuditFileServiceImpl extends BaseServiceImpl
         if (CollectionUtils.isEmpty(bizAiDataAuditFileEntityList)) {
             throw new Exception("please upload files");
         }
-        bizAiDataAuditFileEntityList.stream().map(item-> {
-            try {
-                return save(item);
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-        });
+        for (BizAiDataAuditFileEntity bizAiDataAuditFileEntity : bizAiDataAuditFileEntityList) {
+            save(bizAiDataAuditFileEntity);
+        }
+        return;
     }
 
 }
\ No newline at end of file

src/main/java/cn/com/poc/ai_data_audit/service/impl/BizAiDataAuditTaskServiceImpl.java

@@ -144,15 +144,18 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
         if (CollectionUtils.isEmpty(fileUploadConfirmDto.getFileUploadReturnDtoList())) {
             throw new Exception("Please select the file you wish to upload!");
         }
+
+        //匹配的文件
         List<FileUploadReturnDto> fileUploadReturnDtoList = fileUploadConfirmDto.getFileUploadReturnDtoList();
         Map<String, String> fileCodeNameMap = fileUploadReturnDtoList.stream().collect(Collectors.toMap(FileUploadReturnDto::getOrginalTemplateCode, FileUploadReturnDto::getUploadFileName));
-        Map<String, String> fileNameCodeMap = fileUploadReturnDtoList.stream().collect(Collectors.toMap(FileUploadReturnDto::getUploadFileName, FileUploadReturnDto::getOrginalTemplateCode));
-        Map<String, String> fileuploadNameCodeMap = fileUploadReturnDtoList.stream().collect(Collectors.toMap(FileUploadReturnDto::getUploadFileName, FileUploadReturnDto::getOrginalTemplateCode));
+//        Map<String, String> fileNameCodeMap = fileUploadReturnDtoList.stream().collect(Collectors.toMap(FileUploadReturnDto::getUploadFileName, FileUploadReturnDto::getOrginalTemplateCode));
+//        Map<String, String> fileuploadNameCodeMap = fileUploadReturnDtoList.stream().collect(Collectors.toMap(FileUploadReturnDto::getUploadFileName, FileUploadReturnDto::getOrginalTemplateCode));
 
         if (StringUtils.isBlank(fileCodeNameMap.get("DOC-01")) && StringUtils.isBlank(fileCodeNameMap.get("DOC-02"))) {
             throw new Exception("DOC-01 or DOC-02 can not be null");
         }
 
+        //上传的文件
         Map<String, String> fileMap = new HashMap<>();
         for (FileUploadDto fileUploadDto : fileUploadConfirmDto.getFileUploadDtoList()) {
             fileMap.put(fileUploadDto.getFileName(), fileUploadDto.getFileUrl());
@@ -166,15 +169,27 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
         model.setFileNum(fileUploadConfirmDto.getFileUploadDtoList().size());
         BizAiDataAuditTaskModel savedModel = repository.save(model);
 
-
         List<BizAiDataAuditFileEntity> bizAiDataAuditFileEntityList = new ArrayList<BizAiDataAuditFileEntity>();
-        for (Map.Entry<String, String> entry : fileMap.entrySet()) {
+//        for (Map.Entry<String, String> entry : fileMap.entrySet()) {
+//            BizAiDataAuditFileEntity bizAiDataAuditFileEntity = new BizAiDataAuditFileEntity();
+//            bizAiDataAuditFileEntity.setTaskId(savedModel.getDataAuditTaskId());
+//            bizAiDataAuditFileEntity.setOrginalTemplateCode(StringUtils.isBlank(fileuploadNameCodeMap.get(entry.getKey())) ? null : "other");
+//            bizAiDataAuditFileEntity.setOrginalTemplateName(fileNameCodeMap.get(bizAiDataAuditFileEntity.getOrginalTemplateCode()));
+//            bizAiDataAuditFileEntity.setUploadFileName(entry.getKey());
+//            bizAiDataAuditFileEntity.setUploadFileUrl(entry.getValue());
+//            bizAiDataAuditFileEntityList.add(bizAiDataAuditFileEntity);
+//        }
+
+        for (FileUploadReturnDto fileUploadReturnDto : fileUploadReturnDtoList) {
+            if(StringUtils.isBlank(fileUploadReturnDto.getUploadFileName())){
+                continue;
+            }
             BizAiDataAuditFileEntity bizAiDataAuditFileEntity = new BizAiDataAuditFileEntity();
+            bizAiDataAuditFileEntity.setOrginalTemplateName(fileUploadReturnDto.getOrginalTemplateName());
             bizAiDataAuditFileEntity.setTaskId(savedModel.getDataAuditTaskId());
-            bizAiDataAuditFileEntity.setOrginalTemplateCode(StringUtils.isBlank(fileuploadNameCodeMap.get(entry.getKey())) ? null : "other");
-            bizAiDataAuditFileEntity.setOrginalTemplateName(fileNameCodeMap.get(bizAiDataAuditFileEntity.getOrginalTemplateCode()));
-            bizAiDataAuditFileEntity.setUploadFileName(entry.getKey());
-            bizAiDataAuditFileEntity.setUploadFileUrl(entry.getValue());
+            bizAiDataAuditFileEntity.setOrginalTemplateCode(fileUploadReturnDto.getOrginalTemplateCode());
+            bizAiDataAuditFileEntity.setUploadFileName(fileUploadReturnDto.getUploadFileName());
+            bizAiDataAuditFileEntity.setUploadFileUrl(fileMap.get(fileUploadReturnDto.getUploadFileName()));
             bizAiDataAuditFileEntityList.add(bizAiDataAuditFileEntity);
         }
         bizAiDataAuditFileService.batchSavedFile(bizAiDataAuditFileEntityList);

src/main/java/cn/com/poc/ai_data_audit/service/impl/DataAuditServiceImpl.java

@@ -101,8 +101,17 @@ public class DataAuditServiceImpl extends BaseServiceImpl
         fileNameMap.put("DOC-19", "Temporary Traffic Management Plan");
 
         List<AIDataAuditMatchFileNameResponse> otherList = new ArrayList<>();
-
         List<FileUploadReturnDto> fileUploadReturnDtoList = new ArrayList<>();
+
+        if(fileNames.contains("Form.pdf")){
+            FileUploadReturnDto fileUploadReturnDto = new FileUploadReturnDto();
+            fileUploadReturnDto.setOrginalTemplateName("DOC-01");
+            fileUploadReturnDto.setOrginalTemplateCode("Work Permit Application Details");
+            fileUploadReturnDto.setUploadFileName("Form.pdf");
+            fileUploadReturnDtoList.add(fileUploadReturnDto);
+        }
+
+
         //执行类型匹配
         for (AIDataAuditMatchFileNameResponse aiDataAuditMatchFileNameResponse : aiDataAuditMatchFileNameResponses) {
             if(StringUtils.isBlank(aiDataAuditMatchFileNameResponse.getTemplateName())){
@@ -204,6 +213,20 @@ public class DataAuditServiceImpl extends BaseServiceImpl
         return new MinerUOcrResult();
     }
 
+    public List<FileUploadDto> handleDuplicateFileNames(List<FileUploadDto> fileUploadDtoList) {
+        Map<String, Integer> fileNameCountMap = new HashMap<>();
+
+        return fileUploadDtoList.stream().map(dto -> {
+            String originalFileName = dto.getFileName();
+            int count = fileNameCountMap.getOrDefault(originalFileName, 0);
+            fileNameCountMap.put(originalFileName, count + 1);
 
+            if (count > 0) {
+                String newFileName = originalFileName + "(" + count + ")";
+                dto.setFileName(newFileName);
+            }
+            return dto;
+        }).collect(Collectors.toList());
+    }
 
 }
\ No newline at end of file