Commit 3afdbbbe authored by R10's avatar R10

获取单据结果修改

parent af34b593
......@@ -15,6 +15,7 @@ public class BizAiDataAuditFileConvert {
entity.setOrginalTemplateName(model.getOrginalTemplateName());
entity.setUploadFileName(model.getUploadFileName());
entity.setUploadFileUrl(model.getUploadFileUrl());
entity.setMd5(model.getMd5());
entity.setIsDeleted(model.getIsDeleted());
entity.setCreator(model.getCreator());
entity.setCreatedTime(model.getCreatedTime());
......@@ -32,6 +33,7 @@ public class BizAiDataAuditFileConvert {
model.setOrginalTemplateName(entity.getOrginalTemplateName());
model.setUploadFileName(entity.getUploadFileName());
model.setUploadFileUrl(entity.getUploadFileUrl());
model.setMd5(entity.getMd5());
model.setIsDeleted(entity.getIsDeleted());
model.setCreator(entity.getCreator());
model.setCreatedTime(entity.getCreatedTime());
......@@ -49,6 +51,7 @@ public class BizAiDataAuditFileConvert {
dto.setOrginalTemplateName(entity.getOrginalTemplateName());
dto.setUploadFileName(entity.getUploadFileName());
dto.setUploadFileUrl(entity.getUploadFileUrl());
dto.setMd5(entity.getMd5());
dto.setIsDeleted(entity.getIsDeleted());
dto.setCreator(entity.getCreator());
dto.setCreatedTime(entity.getCreatedTime());
......@@ -66,6 +69,7 @@ public class BizAiDataAuditFileConvert {
entity.setOrginalTemplateName(dto.getOrginalTemplateName());
entity.setUploadFileName(dto.getUploadFileName());
entity.setUploadFileUrl(dto.getUploadFileUrl());
entity.setMd5(dto.getMd5());
entity.setIsDeleted(dto.getIsDeleted());
entity.setCreator(dto.getCreator());
entity.setCreatedTime(dto.getCreatedTime());
......
......@@ -7,6 +7,7 @@ import cn.com.yict.framemax.core.rest.BaseRest;
import cn.com.yict.framemax.web.permission.Access;
import cn.com.yict.framemax.web.permission.Permission;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
......@@ -22,4 +23,12 @@ public interface DataAuditRest extends BaseRest {
public List<FileUploadReturnDto> fileUpload(@RequestBody List<FileUploadDto> fileUploadDtoList) throws Exception;
void createDataAuditTask(@RequestBody FileUploadConfirmDto fileUploadConfirmDto) throws Exception;
/**
* 对话
* @param fileId
* @param input
* @throws Exception
*/
void call(@RequestParam String fileId, @RequestParam String input) throws Exception;
}
package cn.com.poc.ai_data_audit.rest.impl;
import java.util.Comparator;
import java.util.List;
import javax.annotation.Resource;
......@@ -41,7 +42,7 @@ public class BizAiDataAuditTaskRestImpl implements BizAiDataAuditTaskRest {
for (BizAiDataAuditTaskEntity aiDataAuditTaskEntity : bizAiDataAuditTaskEntityList) {
aiDataAuditTaskEntity.setAuditResult(null);
}
return bizAiDataAuditTaskEntityList.stream().map(BizAiDataAuditTaskConvert::entityToDto).collect(Collectors.toList());
return bizAiDataAuditTaskEntityList.stream().sorted(Comparator.comparing(BizAiDataAuditTaskEntity::getDataAuditTaskId).reversed()).map(BizAiDataAuditTaskConvert::entityToDto).collect(Collectors.toList());
}
@Override
......
......@@ -44,5 +44,17 @@ public class DataAuditRestImpl implements DataAuditRest {
bizAiDataAuditTaskService.createDataAuditTask(taskName, fileUploadConfirmDto);
}
/**
* 对话
*
* @param fileId
* @param input
* @throws Exception
*/
@Override
public void call(String fileId, String input) throws Exception {
}
}
package cn.com.poc.ai_data_audit.service.impl;
import cn.com.poc.agent_application.entity.BizAgentApplicationLargeModelListEntity;
import cn.com.poc.ai_data_audit.constants.DataAuditConstants;
import cn.com.poc.ai_data_audit.dto.FileUploadConfirmDto;
import cn.com.poc.ai_data_audit.dto.FileUploadDto;
......@@ -206,6 +207,7 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
// example.setModelState();
// bizFileUploadRecordService.findByExample(null)
for (FileUploadReturnDto fileUploadReturnDto : fileUploadReturnDtoList) {
if (StringUtils.isBlank(fileUploadReturnDto.getUploadFileName())) {
continue;
......@@ -219,6 +221,19 @@ public class BizAiDataAuditTaskServiceImpl extends BaseServiceImpl
// bizAiDataAuditFileEntity.setDataAuditFileId();
bizAiDataAuditFileEntityList.add(bizAiDataAuditFileEntity);
}
List<String> uploadFileUrlList = bizAiDataAuditFileEntityList.stream().map(item -> item.getUploadFileUrl()).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(uploadFileUrlList)){
List<BizFileUploadRecordModel> byFileLink = bizFileUploadRecordService.findByFileLink(uploadFileUrlList);
Map<String, List<BizFileUploadRecordModel>> bizFileUploadRecordModelMap = byFileLink.stream().collect(Collectors.groupingBy(BizFileUploadRecordModel::getFileUrl));
for (BizAiDataAuditFileEntity bizAiDataAuditFileEntity : bizAiDataAuditFileEntityList) {
List<BizFileUploadRecordModel> bizFileUploadRecordModels = bizFileUploadRecordModelMap.get(bizAiDataAuditFileEntity.getUploadFileUrl());
if (CollectionUtils.isNotEmpty(bizFileUploadRecordModels)) {
bizAiDataAuditFileEntity.setMd5(bizFileUploadRecordModels.get(0).getMd5());
}
}
}
bizAiDataAuditFileService.batchSavedFile(bizAiDataAuditFileEntityList);
}
}
\ No newline at end of file
SELECT
biz_file_upload_record.id,
biz_file_upload_record.file_name,
biz_file_upload_record.file_url,
biz_file_upload_record.cover_sheet_url,
biz_file_upload_record.md5
FROM
biz_file_upload_record
where 1=1
<< AND biz_file_upload_record.file_url in (:fileUrlList) >>
\ No newline at end of file
package cn.com.poc.common.query;
import java.io.Serializable;
import java.util.List;
/**
* Query Condition class for FileUploadQuery
*/
public class FileUploadQueryCondition implements Serializable{
private static final long serialVersionUID = 1L;
private List<String> fileUrlList;
public List<String> getFileUrlList(){
return this.fileUrlList;
}
public void setFileUrlList(List<String> fileUrlList){
this.fileUrlList = fileUrlList;
}
}
\ No newline at end of file
package cn.com.poc.common.query;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import cn.com.yict.framemax.data.model.BaseItemClass;
/**
* Query Item class for FileUploadQuery
*/
@Entity
public class FileUploadQueryItem extends BaseItemClass implements Serializable{
private static final long serialVersionUID = 1L;
/** id
*id
*/
private java.lang.Long id;
@Column(name = "id")
public java.lang.Long getId(){
return this.id;
}
public void setId(java.lang.Long id){
this.id = id;
}
/** file_name
*file_name
*/
private java.lang.String fileName;
@Column(name = "file_name")
public java.lang.String getFileName(){
return this.fileName;
}
public void setFileName(java.lang.String fileName){
this.fileName = fileName;
}
/** file_url
*file_url
*/
private java.lang.String fileUrl;
@Column(name = "file_url")
public java.lang.String getFileUrl(){
return this.fileUrl;
}
public void setFileUrl(java.lang.String fileUrl){
this.fileUrl = fileUrl;
}
/** cover_sheet_url
*cover_sheet_url
*/
private java.lang.String coverSheetUrl;
@Column(name = "cover_sheet_url")
public java.lang.String getCoverSheetUrl(){
return this.coverSheetUrl;
}
public void setCoverSheetUrl(java.lang.String coverSheetUrl){
this.coverSheetUrl = coverSheetUrl;
}
/** md5
*md5
*/
private java.lang.String md5;
@Column(name = "md5")
public java.lang.String getMd5(){
return this.md5;
}
public void setMd5(java.lang.String md5){
this.md5 = md5;
}
}
\ No newline at end of file
......@@ -15,6 +15,8 @@ public interface BizFileUploadRecordService extends BaseService {
List<BizFileUploadRecordModel> findByExample(BizFileUploadRecordModel example,PagingInfo pagingInfo) throws Exception;
List<BizFileUploadRecordModel> findByFileLink(List<String> fileLink) throws Exception;
void delete(BizFileUploadRecordModel model) throws Exception;
void deleteById(Long id) throws Exception;
......
package cn.com.poc.common.service.impl;
import cn.com.poc.common.model.BizFileUploadRecordModel;
import cn.com.poc.common.query.FileUploadQueryCondition;
import cn.com.poc.common.query.FileUploadQueryItem;
import cn.com.poc.common.repository.BizFileUploadRecordRepository;
import cn.com.poc.common.service.BizFileUploadRecordService;
import cn.com.poc.common.utils.StringUtils;
import cn.com.poc.law.query.LawyerWritingTemplateTypeQueryCondition;
import cn.com.poc.law.query.LawyerWritingTemplateTypeQueryItem;
import cn.com.yict.framemax.core.service.impl.BaseServiceImpl;
import cn.com.yict.framemax.data.model.PagingInfo;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
......@@ -46,6 +52,27 @@ public class BizFileUploadRecordServiceImpl extends BaseServiceImpl
return this.repository.findByExample(example, pagingInfo);
}
@Override
public List<BizFileUploadRecordModel> findByFileLink(List<String> fileLinks) throws Exception {
if (CollectionUtils.isEmpty(fileLinks)) {
throw new Exception("fileLink is empty");
}
FileUploadQueryCondition fileUploadQueryCondition = new FileUploadQueryCondition();
fileUploadQueryCondition.setFileUrlList(fileLinks);
List<FileUploadQueryItem> fileUploadQueryItems = this.sqlDao.query(fileUploadQueryCondition, FileUploadQueryItem.class);
List<BizFileUploadRecordModel> bizFileUploadRecordModels = new ArrayList<>();
if(CollectionUtils.isNotEmpty(fileUploadQueryItems)){
for (FileUploadQueryItem fileUploadQueryItem : fileUploadQueryItems) {
BizFileUploadRecordModel bizFileUploadRecordModel = new BizFileUploadRecordModel();
BeanUtils.copyProperties(fileUploadQueryItem,bizFileUploadRecordModel);
bizFileUploadRecordModels.add(bizFileUploadRecordModel);
}
}
return bizFileUploadRecordModels;
}
public void delete(BizFileUploadRecordModel model) throws Exception {
this.repository.remove(model);
}
......
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