diff --git a/src/main/java/com/supervision/police/controller/CaseEvidenceController.java b/src/main/java/com/supervision/police/controller/CaseEvidenceController.java index 42a57a8..b733101 100644 --- a/src/main/java/com/supervision/police/controller/CaseEvidenceController.java +++ b/src/main/java/com/supervision/police/controller/CaseEvidenceController.java @@ -158,8 +158,9 @@ public class CaseEvidenceController { @Operation(summary = "查询证据详情-结果以树的方式展示") @GetMapping("/ocrAndExtract/details") public R> evidenceDetails(@RequestParam("caseId") String caseId, - @RequestParam(value = "batchNo",required = false) String batchNo) { - List evidenceDirectoryDTOS = caseEvidenceService.evidenceDetails(caseId,batchNo); + @RequestParam(value = "batchNo",required = false) String batchNo, + @RequestParam(value = "evidenceId",required = false) String evidenceId) { + List evidenceDirectoryDTOS = caseEvidenceService.evidenceDetails(caseId,batchNo,evidenceId); return R.ok(evidenceDirectoryDTOS); } diff --git a/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java b/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java index 420dfa8..c37d850 100644 --- a/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java +++ b/src/main/java/com/supervision/police/dto/EvidenceCategoryDTO.java @@ -34,6 +34,11 @@ public class EvidenceCategoryDTO { */ private String parentId; + /** + * 提示词id + */ + private String promptId; + /** * 提示词名称 */ diff --git a/src/main/java/com/supervision/police/mapper/EvidenceFileMapper.java b/src/main/java/com/supervision/police/mapper/EvidenceFileMapper.java index 725ec6b..065abb5 100644 --- a/src/main/java/com/supervision/police/mapper/EvidenceFileMapper.java +++ b/src/main/java/com/supervision/police/mapper/EvidenceFileMapper.java @@ -21,7 +21,8 @@ public interface EvidenceFileMapper extends BaseMapper { Page pageListFileInfo(@Param("evidenceIds") List evidenceIds,@Param("page") Page page); - List listFileInfoByCaseIdAndBatchNo(@Param("caseId")String caseId,@Param("batchNo") String batchNo); + List queryFileInfoList(@Param("caseId")String caseId, @Param("batchNo") String batchNo, + @Param("evidenceId")String evidenceId, @Param("directoryId") String directoryId); } diff --git a/src/main/java/com/supervision/police/service/CaseEvidenceService.java b/src/main/java/com/supervision/police/service/CaseEvidenceService.java index 75ac1d5..32be10e 100644 --- a/src/main/java/com/supervision/police/service/CaseEvidenceService.java +++ b/src/main/java/com/supervision/police/service/CaseEvidenceService.java @@ -74,6 +74,8 @@ public interface CaseEvidenceService extends IService { List listFileTree(String caseId,String batchNo); + List listFileTree(String caseId,String batchNo,String evidenceId,String directoryId); + List listDirectoryTree(String caseId); @@ -133,7 +135,7 @@ public interface CaseEvidenceService extends IService { void verifyEvidence(VerifyEvidenceReqVO verifyEvidenceReqVO); - List evidenceDetails(String caseId, String batchNo); + List evidenceDetails(String caseId, String batchNo,String evidenceId); String generateDirectoryName(String caseId, String categoryId, String provider); diff --git a/src/main/java/com/supervision/police/service/EvidenceFileService.java b/src/main/java/com/supervision/police/service/EvidenceFileService.java index 1687f7e..f86ca75 100644 --- a/src/main/java/com/supervision/police/service/EvidenceFileService.java +++ b/src/main/java/com/supervision/police/service/EvidenceFileService.java @@ -20,5 +20,7 @@ public interface EvidenceFileService extends IService { List listByFileIds(List fileIds); - List listFileInfoByCaseIdAndBatchNo(String caseId, String batchNo); + List queryFileInfoList(String caseId, String batchNo); + + List queryFileInfoList(String caseId, String batchNo, String evidenceId, String directoryId); } 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 62b6c9f..fa46fdd 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java @@ -333,7 +333,19 @@ public class CaseEvidenceServiceImpl extends ServiceImpl evidenceDirectoryDTOS = evidenceDirectoryService.listDirectoryTree(caseId); - evidenceDirectoryService.appendFile(evidenceDirectoryDTOS, evidenceFileService.listFileInfoByCaseIdAndBatchNo(caseId,batchNo)); + evidenceDirectoryService.appendFile(evidenceDirectoryDTOS, evidenceFileService.queryFileInfoList(caseId,batchNo)); + + return evidenceDirectoryDTOS; + } + + @Override + public List listFileTree(String caseId, String batchNo, String evidenceId, String directoryId) { + Assert.notEmpty(caseId,"案件ID不能为空!"); + List evidenceDirectoryDTOS = evidenceDirectoryService.listDirectoryTree(caseId); + + + evidenceDirectoryService.appendFile(evidenceDirectoryDTOS, + evidenceFileService.queryFileInfoList(caseId,batchNo, evidenceId, directoryId)); return evidenceDirectoryDTOS; } @@ -575,8 +587,8 @@ public class CaseEvidenceServiceImpl extends ServiceImpl evidenceDetails(String caseId, String batchNo) { - List evidenceDirectoryDTOS = listFileTree(caseId,batchNo); + public List evidenceDetails(String caseId, String batchNo,String evidenceId) { + List evidenceDirectoryDTOS = listFileTree(caseId,batchNo,evidenceId,null); List caseEvidenceList = this.lambdaQuery().eq(CaseEvidence::getCaseId, caseId).list(); List categoryPromptDTOS = evidenceDirectoryService.listCategoryPrompt(caseId); @@ -589,7 +601,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl listFileInfoByCaseIdAndBatchNo(String caseId,String batchNo) { - return super.getBaseMapper().listFileInfoByCaseIdAndBatchNo(caseId,batchNo); + public List queryFileInfoList(String caseId, String batchNo) { + return super.getBaseMapper().queryFileInfoList(caseId,batchNo, null,null); + } + + @Override + public List queryFileInfoList(String caseId, String batchNo, String evidenceId, String directoryId) { + return super.getBaseMapper().queryFileInfoList(caseId,batchNo, evidenceId,directoryId); } } diff --git a/src/main/resources/mapper/EvidenceFileMapper.xml b/src/main/resources/mapper/EvidenceFileMapper.xml index ef1b585..2c0f704 100644 --- a/src/main/resources/mapper/EvidenceFileMapper.xml +++ b/src/main/resources/mapper/EvidenceFileMapper.xml @@ -44,7 +44,7 @@ - select ef.file_id as fileId, ef.evidence_id as evidenceId, @@ -63,6 +63,12 @@ and ef.batch_no = #{batchNo} + + and ef.directory_id = #{directoryId} + + + and ef.evidence_id = #{evidenceId} +