1. 修复证据改造bug

topo_dev
xueqingkun 6 months ago
parent 398dc5796a
commit 4826e43fa9

@ -8,6 +8,7 @@ import lombok.Data;
import java.util.*; import java.util.*;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* *
@ -41,11 +42,6 @@ public class EvidenceDirectoryDTO {
private List<EvidenceDirectoryDTO> child; private List<EvidenceDirectoryDTO> child;
/**
* id
*/
private List<String> fileIdList = new ArrayList<>();
/** /**
* *
*/ */
@ -113,8 +109,8 @@ public class EvidenceDirectoryDTO {
public List<String> listAllFileId(){ public List<String> listAllFileId(){
List<String> fileIdList = new ArrayList<>(); List<String> fileIdList = new ArrayList<>();
if (CollUtil.isNotEmpty(this.fileIdList)){ if (CollUtil.isNotEmpty(this.fileInfoList)){
fileIdList.addAll(this.fileIdList); fileIdList.addAll(this.fileInfoList.stream().map(EvidenceFileDTO::getFileId).toList());
} }
if (CollUtil.isNotEmpty(this.child)){ if (CollUtil.isNotEmpty(this.child)){
for (EvidenceDirectoryDTO child : this.getChild()) { for (EvidenceDirectoryDTO child : this.getChild()) {
@ -261,4 +257,11 @@ public class EvidenceDirectoryDTO {
} }
} }
public List<String> getFileIdList() {
if (CollUtil.isNotEmpty(this.fileInfoList)){
return this.fileInfoList.stream().map(EvidenceFileDTO::getFileId).collect(Collectors.toList());
}else {
return new ArrayList<>();
}
}
} }

@ -6,6 +6,8 @@ import com.supervision.police.domain.CaseEvidence;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime;
@Data @Data
public class EvidenceFileDTO { public class EvidenceFileDTO {
@ -66,6 +68,8 @@ public class EvidenceFileDTO {
private String evidenceType; private String evidenceType;
private LocalDateTime updateTime;
public EvidenceFileDTO() { public EvidenceFileDTO() {
} }
@ -76,6 +80,7 @@ public class EvidenceFileDTO {
this.evidenceType = caseEvidence.getEvidenceType(); this.evidenceType = caseEvidence.getEvidenceType();
this.processStatus = caseEvidence.getProcessStatus(); this.processStatus = caseEvidence.getProcessStatus();
this.directoryId = caseEvidence.getDirectoryId(); this.directoryId = caseEvidence.getDirectoryId();
this.updateTime = caseEvidence.getUpdateTime();
} }
public CaseEvidence toCaseEvidence(String caseId) { public CaseEvidence toCaseEvidence(String caseId) {

@ -466,6 +466,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
log.info("ocrAndExtract:开始只进行文件内容识别..."); log.info("ocrAndExtract:开始只进行文件内容识别...");
Map<String, List<EvidenceFileDTO>> evidenceMap = ocrFileDTOList.stream().collect(Collectors.groupingBy(EvidenceFileDTO::getEvidenceId)); Map<String, List<EvidenceFileDTO>> evidenceMap = ocrFileDTOList.stream().collect(Collectors.groupingBy(EvidenceFileDTO::getEvidenceId));
for (Map.Entry<String, List<EvidenceFileDTO>> entry : evidenceMap.entrySet()) { for (Map.Entry<String, List<EvidenceFileDTO>> entry : evidenceMap.entrySet()) {
String evidenceId = entry.getKey(); String evidenceId = entry.getKey();
List<EvidenceFileDTO> value = entry.getValue(); List<EvidenceFileDTO> value = entry.getValue();
List<FileOcrProcess> fileOcrProcesses = fileOcrProcessService.multipleTypeOcrProcess(value.stream().map(EvidenceFileDTO::getFileId).toList(), evidenceId); List<FileOcrProcess> fileOcrProcesses = fileOcrProcessService.multipleTypeOcrProcess(value.stream().map(EvidenceFileDTO::getFileId).toList(), evidenceId);

@ -83,7 +83,8 @@
ce.evidence_name as evidenceName, ce.evidence_name as evidenceName,
ce.process_status as processStatus, ce.process_status as processStatus,
ce.provider as provider, ce.provider as provider,
ce.evidence_type as evidenceType ce.evidence_type as evidenceType,
ce.update_time as updateTime
from evidence_file ef from evidence_file ef
left join minio_file mf on ef.file_id = mf.id left join minio_file mf on ef.file_id = mf.id
left join case_evidence ce on ef.evidence_id = ce.id left join case_evidence ce on ef.evidence_id = ce.id

Loading…
Cancel
Save