diff --git a/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java b/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java index c34e1db..fafd577 100644 --- a/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java +++ b/src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java @@ -8,6 +8,7 @@ import lombok.Data; import java.util.*; import java.util.List; +import java.util.stream.Collectors; /** * 案件证据目录 @@ -41,11 +42,6 @@ public class EvidenceDirectoryDTO { private List<EvidenceDirectoryDTO> child; - /** - * 文件id,接收前端传入的参数 - */ - private List<String> fileIdList = new ArrayList<>(); - /** * 文件信息 */ @@ -113,8 +109,8 @@ public class EvidenceDirectoryDTO { public List<String> listAllFileId(){ List<String> fileIdList = new ArrayList<>(); - if (CollUtil.isNotEmpty(this.fileIdList)){ - fileIdList.addAll(this.fileIdList); + if (CollUtil.isNotEmpty(this.fileInfoList)){ + fileIdList.addAll(this.fileInfoList.stream().map(EvidenceFileDTO::getFileId).toList()); } if (CollUtil.isNotEmpty(this.child)){ 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<>(); + } + } } diff --git a/src/main/java/com/supervision/police/dto/EvidenceFileDTO.java b/src/main/java/com/supervision/police/dto/EvidenceFileDTO.java index 38e348a..ba2c32a 100644 --- a/src/main/java/com/supervision/police/dto/EvidenceFileDTO.java +++ b/src/main/java/com/supervision/police/dto/EvidenceFileDTO.java @@ -6,6 +6,8 @@ import com.supervision.police.domain.CaseEvidence; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import java.time.LocalDateTime; + @Data public class EvidenceFileDTO { @@ -66,6 +68,8 @@ public class EvidenceFileDTO { private String evidenceType; + private LocalDateTime updateTime; + public EvidenceFileDTO() { } @@ -76,6 +80,7 @@ public class EvidenceFileDTO { this.evidenceType = caseEvidence.getEvidenceType(); this.processStatus = caseEvidence.getProcessStatus(); this.directoryId = caseEvidence.getDirectoryId(); + this.updateTime = caseEvidence.getUpdateTime(); } public CaseEvidence toCaseEvidence(String caseId) { diff --git a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java index 8266fb5..58d7828 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java @@ -466,6 +466,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas log.info("ocrAndExtract:开始只进行文件内容识别..."); Map<String, List<EvidenceFileDTO>> evidenceMap = ocrFileDTOList.stream().collect(Collectors.groupingBy(EvidenceFileDTO::getEvidenceId)); for (Map.Entry<String, List<EvidenceFileDTO>> entry : evidenceMap.entrySet()) { + String evidenceId = entry.getKey(); List<EvidenceFileDTO> value = entry.getValue(); List<FileOcrProcess> fileOcrProcesses = fileOcrProcessService.multipleTypeOcrProcess(value.stream().map(EvidenceFileDTO::getFileId).toList(), evidenceId); diff --git a/src/main/resources/mapper/EvidenceFileMapper.xml b/src/main/resources/mapper/EvidenceFileMapper.xml index 1fed88c..d21ca60 100644 --- a/src/main/resources/mapper/EvidenceFileMapper.xml +++ b/src/main/resources/mapper/EvidenceFileMapper.xml @@ -83,7 +83,8 @@ ce.evidence_name as evidenceName, ce.process_status as processStatus, ce.provider as provider, - ce.evidence_type as evidenceType + ce.evidence_type as evidenceType, + ce.update_time as updateTime from evidence_file ef left join minio_file mf on ef.file_id = mf.id left join case_evidence ce on ef.evidence_id = ce.id