Skip to content

P
poc-api
Commit af34b593 authored by R10's avatar R10
Browse files
Options

AI data audit 文件提交bugfix

parent 5358aac6
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 17 deletions
src/main/java/cn/com/poc/ai_data_audit/dto/BizAiDataAuditFileDto.java
View file @ af34b593
......@@ -75,6 +75,18 @@ public class BizAiDataAuditFileDto {
public void setUploadFileUrl(java.lang.String uploadFileUrl){
this.uploadFileUrl = uploadFileUrl;
}
/** md5
*
*/
private java.lang.String md5;
public java.lang.String getMd5(){
return this.md5;
}
public void setMd5(java.lang.String md5){
this.md5 = md5;
}
/** is_deleted
*是否删除 1、Y 是 2、N 否
......
src/main/java/cn/com/poc/ai_data_audit/entity/BizAiDataAuditFileEntity.java
View file @ af34b593
......@@ -75,6 +75,18 @@ public class BizAiDataAuditFileEntity {
public void setUploadFileUrl(java.lang.String uploadFileUrl){
this.uploadFileUrl = uploadFileUrl;
}
/** md5
*
*/
private java.lang.String md5;
public java.lang.String getMd5(){
return this.md5;
}
public void setMd5(java.lang.String md5){
this.md5 = md5;
}
/** is_deleted
*是否删除 1、Y 是 2、N 否
......
src/main/java/cn/com/poc/ai_data_audit/model/BizAiDataAuditFileModel.java
View file @ af34b593
......@@ -122,6 +122,22 @@ public class BizAiDataAuditFileModel extends BaseModelClass implements Serializa
}
/** md5
*
*/
private java.lang.String md5;
@Column(name = "md5",length = 1000)
public java.lang.String getMd5(){
return this.md5;
}
public void setMd5(java.lang.String md5){
this.md5 = md5;
super.addValidField("md5");
}
/** is_deleted
*是否删除 1、Y 是 2、N 否
*/
......
src/main/java/cn/com/poc/ai_data_audit/service/impl/BizAiDataAuditFileServiceImpl.java
View file @ af34b593
......@@ -7,9 +7,12 @@ import cn.com.poc.ai_data_audit.entity.BizAiDataAuditFileEntity;
import cn.com.poc.ai_data_audit.convert.BizAiDataAuditFileConvert;
import cn.com.poc.ai_data_audit.repository.BizAiDataAuditFileRepository;
import cn.com.yict.framemax.data.model.PagingInfo;
import cn.hutool.crypto.digest.MD5;
import org.springframework.stereotype.Service;
import org.apache.commons.collections4.CollectionUtils;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.stream.Collectors;
import java.util.List;
......@@ -120,7 +123,6 @@ public class BizAiDataAuditFileServiceImpl extends BaseServiceImpl
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
View file @ af34b593
......@@ -6,6 +6,8 @@ import cn.com.poc.ai_data_audit.dto.FileUploadDto;
import cn.com.poc.ai_data_audit.dto.FileUploadReturnDto;
import cn.com.poc.ai_data_audit.entity.BizAiDataAuditFileEntity;
import cn.com.poc.ai_data_audit.service.BizAiDataAuditFileService;
import cn.com.poc.common.model.BizFileUploadRecordModel;
import cn.com.poc.common.service.BizFileUploadRecordService;
import cn.com.poc.common.service.BosConfigService;
import cn.com.poc.common.utils.BlContext;
import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
......@@ -28,6 +30,7 @@ import java.util.List;
import javax.annotation.Resource;
import org.springframework.util.Assert;
import org.springframework.web.multipart.commons.CommonsFileUploadSupport;
@Service
public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
......@@ -38,6 +41,9 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
@Resource
private BizAiDataAuditFileService bizAiDataAuditFileService;
@Resource
private BizFileUploadRecordService bizFileUploadRecordService;
@Override
public BizAiDataAuditTaskEntity get(java.lang.Integer id) throws Exception {
Assert.notNull(id);
......@@ -147,14 +153,26 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
//匹配的文件
List<FileUploadReturnDto> fileUploadReturnDtoList = fileUploadConfirmDto.getFileUploadReturnDtoList();
Map<String, String> fileCodeNameMap = fileUploadReturnDtoList.stream().collect(Collectors.toMap(FileUploadReturnDto::getOrginalTemplateCode, FileUploadReturnDto::getUploadFileName));
// Map<String, String> fileCodeNameMap = fileUploadReturnDtoList.stream().filter(item->StringUtils.isNotBlank(item.getOrginalTemplateCode())).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));
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");
String fileNameDoc1 = "";
String fileNameDoc2 = "";
for (FileUploadReturnDto fileUploadReturnDto : fileUploadReturnDtoList) {
if ("DOC-01".equals(fileUploadReturnDto.getOrginalTemplateCode())) {
fileNameDoc1 = fileUploadReturnDto.getUploadFileName();
} else if ("DOC-02".equals(fileUploadReturnDto.getOrginalTemplateCode())) {
fileNameDoc2 = fileUploadReturnDto.getUploadFileName();
}
}
if (StringUtils.isBlank(fileNameDoc1) && StringUtils.isBlank(fileNameDoc2)) {
throw new Exception("Work Permit Application Details or Work Permit Extension Details can not be null");
}
//上传的文件
Map<String, String> fileMap = new HashMap<>();
for (FileUploadDto fileUploadDto : fileUploadConfirmDto.getFileUploadDtoList()) {
......@@ -179,9 +197,17 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
// bizAiDataAuditFileEntity.setUploadFileUrl(entry.getValue());
// bizAiDataAuditFileEntityList.add(bizAiDataAuditFileEntity);
// }
// BizFileUploadRecordModel example = new BizFileUploadRecordModel();
// example.setId();
// example.setFileName();
// example.setFileUrl();
// example.setCoverSheetUrl();
// example.setMd5();
// example.setModelState();
// bizFileUploadRecordService.findByExample(null)
for (FileUploadReturnDto fileUploadReturnDto : fileUploadReturnDtoList) {
if(StringUtils.isBlank(fileUploadReturnDto.getUploadFileName())){
if (StringUtils.isBlank(fileUploadReturnDto.getUploadFileName())) {
continue;
}
BizAiDataAuditFileEntity bizAiDataAuditFileEntity = new BizAiDataAuditFileEntity();
......@@ -190,6 +216,7 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
bizAiDataAuditFileEntity.setOrginalTemplateCode(fileUploadReturnDto.getOrginalTemplateCode());
bizAiDataAuditFileEntity.setUploadFileName(fileUploadReturnDto.getUploadFileName());
bizAiDataAuditFileEntity.setUploadFileUrl(fileMap.get(fileUploadReturnDto.getUploadFileName()));
// bizAiDataAuditFileEntity.setDataAuditFileId();
bizAiDataAuditFileEntityList.add(bizAiDataAuditFileEntity);
}
bizAiDataAuditFileService.batchSavedFile(bizAiDataAuditFileEntityList);
......
src/main/java/cn/com/poc/ai_data_audit/service/impl/DataAuditServiceImpl.java
View file @ af34b593
......@@ -35,8 +35,6 @@ import java.util.stream.Collectors;
public class DataAuditServiceImpl extends BaseServiceImpl
implements DataAuditService {
@Resource
private MinerUOcrService minerUOcrService;
@Resource
private LLMService llmService;
@Resource
......@@ -46,7 +44,7 @@ public class DataAuditServiceImpl extends BaseServiceImpl
@Override
public List fileUploadAndProcessing(List<FileUploadDto> fileUploadDtoList) throws ExecutionException, InterruptedException {
fileUploadDtoList.stream().collect(Collectors.groupingBy(item->item.getFileName()));
fileUploadDtoList.stream().collect(Collectors.groupingBy(item -> item.getFileName()));
// 获取单个文件的文件名
List<String> fileNames = fileUploadDtoList.stream()
......@@ -103,18 +101,24 @@ public class DataAuditServiceImpl extends BaseServiceImpl
List<AIDataAuditMatchFileNameResponse> otherList = new ArrayList<>();
List<FileUploadReturnDto> fileUploadReturnDtoList = new ArrayList<>();
if(fileNames.contains("Form.pdf")){
if (fileNames.contains("Form.pdf")) {
FileUploadReturnDto fileUploadReturnDto = new FileUploadReturnDto();
fileUploadReturnDto.setOrginalTemplateName("DOC-01");
fileUploadReturnDto.setOrginalTemplateCode("Work Permit Application Details");
fileUploadReturnDto.setOrginalTemplateCode("DOC-01");
fileUploadReturnDto.setOrginalTemplateName("Work Permit Application Details");
fileUploadReturnDto.setUploadFileName("Form.pdf");
fileUploadReturnDtoList.add(fileUploadReturnDto);
FileUploadReturnDto fileUploadExtensionDto = new FileUploadReturnDto();
fileUploadExtensionDto.setOrginalTemplateCode("DOC-02");
fileUploadExtensionDto.setOrginalTemplateName("Work Permit Extension Details");
fileUploadExtensionDto.setUploadFileName("");
fileUploadReturnDtoList.add(fileUploadExtensionDto);
}
//执行类型匹配
for (AIDataAuditMatchFileNameResponse aiDataAuditMatchFileNameResponse : aiDataAuditMatchFileNameResponses) {
if(StringUtils.isBlank(aiDataAuditMatchFileNameResponse.getTemplateName())){
if (StringUtils.isBlank(aiDataAuditMatchFileNameResponse.getTemplateName())) {
otherList.add(aiDataAuditMatchFileNameResponse);
continue;
}
......@@ -125,7 +129,7 @@ public class DataAuditServiceImpl extends BaseServiceImpl
fileUploadReturnDtoList.add(fileUploadReturnDto);
}
for (AIDataAuditMatchFileNameResponse other: otherList) {
for (AIDataAuditMatchFileNameResponse other : otherList) {
FileUploadReturnDto fileUploadReturnDto = new FileUploadReturnDto();
fileUploadReturnDto.setOrginalTemplateName("ohter");
fileUploadReturnDto.setOrginalTemplateCode("ohter");
......@@ -143,8 +147,8 @@ public class DataAuditServiceImpl extends BaseServiceImpl
throw new BusinessException("获取对话提示词失败");
}
String fileNamesString = String.join(",", fileNames);
String prompt = documentDialoguePrompt.getConfigSystem().replace("${uploadFileName}", fileNamesString);
fileNames = fileNames.stream().filter(item -> !item.contains("Form.pdf")).collect(Collectors.toList());
String prompt = documentDialoguePrompt.getConfigSystem().replace("${uploadFileName}", JSON.toJSONString(fileNames));
//组装请求参数
List<Message> messages = buildMessages("", null, prompt);
......@@ -160,7 +164,7 @@ public class DataAuditServiceImpl extends BaseServiceImpl
throw new BusinessException("获取失败");
}
String message = chat.getMessage().replaceAll("```json", StringUtils.EMPTY).replaceAll("```", StringUtils.EMPTY);
List<AIDataAuditMatchFileNameResponse> aIDataAuditMatchFileNameResponses= JSON.parseArray(message, AIDataAuditMatchFileNameResponse.class);
List<AIDataAuditMatchFileNameResponse> aIDataAuditMatchFileNameResponses = JSON.parseArray(message, AIDataAuditMatchFileNameResponse.class);
if (ObjectUtil.isEmpty(plaintiff)) {
throw new BusinessException("提取失败");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment