diff --git a/src/main/java/com/supervision/police/dto/NotePromptExtractAttributesDto.java b/src/main/java/com/supervision/police/dto/NotePromptExtractAttributesDto.java index f00b3b4..0491345 100644 --- a/src/main/java/com/supervision/police/dto/NotePromptExtractAttributesDto.java +++ b/src/main/java/com/supervision/police/dto/NotePromptExtractAttributesDto.java @@ -4,7 +4,15 @@ import lombok.Data; @Data public class NotePromptExtractAttributesDto { + private String attrName; + private String attrValue; + + /** + * 1: 文字 + * 2: 数字 + * 3: 日期 + */ private String attrValueType; } diff --git a/src/main/java/com/supervision/police/service/ComDictionaryService.java b/src/main/java/com/supervision/police/service/ComDictionaryService.java index 74d4e07..b7d1740 100644 --- a/src/main/java/com/supervision/police/service/ComDictionaryService.java +++ b/src/main/java/com/supervision/police/service/ComDictionaryService.java @@ -25,6 +25,9 @@ public interface ComDictionaryService extends IService { Map getDictionaryMap(String type); + + Map getDictionaryMapReverse(String type); + R insertDictionary(ComDictionary dictionary); R updateDictionary(ComDictionary dictionary); 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 5d1b009..444b06f 100644 --- a/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java @@ -604,9 +604,24 @@ public class CaseEvidenceServiceImpl extends ServiceImpl evidenceDetails(String caseId, String batchNo,String evidenceId) { + List evidenceDirectoryDTOS = listFileTree(caseId,batchNo,evidenceId,null); List caseEvidenceList = this.lambdaQuery().eq(CaseEvidence::getCaseId, caseId).list(); + // 强行翻译 + Map dictionaryMap = comDictionaryService.getDictionaryMapReverse("prompt_attribute_valuetype"); + for (CaseEvidence caseEvidence : caseEvidenceList) { + List property = caseEvidence.getProperty(); + if (CollUtil.isNotEmpty(property)){ + for (NotePromptExtractAttributesDto notePromptExtractAttributesDto : property) { + String attrValueType = notePromptExtractAttributesDto.getAttrValueType(); + if (StrUtil.isNotEmpty(attrValueType) && dictionaryMap.containsKey(attrValueType)){ + notePromptExtractAttributesDto.setAttrValueType(dictionaryMap.get(attrValueType)); + } + } + } + } + List categoryPromptDTOS = evidenceDirectoryService.listCategoryPrompt(caseId); Map caseEvidenceMap = caseEvidenceList.stream().collect(Collectors.toMap(CaseEvidence::getId, Function.identity())); diff --git a/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java index 29d0153..c7edc3a 100644 --- a/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java @@ -74,6 +74,15 @@ public class ComDictionaryServiceImpl extends ServiceImpl getDictionaryMapReverse(String type) { + if (StrUtil.isEmpty(type)){ + return null; + } + List list = super.lambdaQuery().eq(ComDictionary::getType, type).ne(ComDictionary::getPid,0L).list(); + return list.stream().collect(Collectors.toMap(ComDictionary::getLabel,ComDictionary::getValue)); + } + /** * 根据条件查询字典表,供内部调用. * @param dictionaryByTypeParam