1. 证据详情添加所属目录

src/main/java/com/supervision/police/dto/CaseEvidenceDTO.java

@@ -1,16 +1,14 @@
 package com.supervision.police.dto;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.supervision.constant.EvidencePropertyName;
 import com.supervision.police.domain.CaseEvidence;
 import com.supervision.police.domain.EvidenceFile;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 案件证据信息
@@ -30,6 +28,18 @@ public class CaseEvidenceDTO {
     @Schema(description = "案件证据类型")
     private String evidenceType;
 
+    /**
+     * 流程状态 0:待处理 1：处理中 2：处理成功 3：处理失败
+     */
+    private String processStatus;
+
+    /**
+     * 追加文件处理进度 0: 无处理任务 1：有处理任务
+     */
+    private String appendProcessing;
+
+    private String title;
+
     @Schema(description = "证据提供人")
     private String provider;
 
@@ -43,7 +53,7 @@ public class CaseEvidenceDTO {
     private List<String> fileIdList;
 
     @Schema(description = "案件证据属性")
-    private Map<String,String> property= new HashMap<>();
+    private List<NotePromptExtractAttributesDto> property = new ArrayList<>();
 
     @Schema(description = "案件证据文件列表")
     private List<EvidenceFile> evidenceFileList = new ArrayList<>();
@@ -51,6 +61,8 @@ public class CaseEvidenceDTO {
     @Schema(description = "目录id")
     private String directoryId;
 
+    private String directoryNamePath;
+
 
     public CaseEvidence toCaseEvidence(){
         CaseEvidence caseEvidence = new CaseEvidence();
@@ -64,9 +76,31 @@ public class CaseEvidenceDTO {
         return caseEvidence;
     }
 
-    public void setTitleProperty(){
-        if (StrUtil.isNotEmpty(this.evidenceName)){
-            this.property.put(EvidencePropertyName.TITLE.getName(), this.evidenceName);
+    public CaseEvidenceDTO() {
+    }
+
+    public CaseEvidenceDTO(CaseEvidence caseEvidence) {
+        this.id = caseEvidence.getId();
+        this.caseId = caseEvidence.getCaseId();
+        this.evidenceName = caseEvidence.getEvidenceName();
+        this.evidenceType = caseEvidence.getEvidenceType();
+        this.provider = caseEvidence.getProvider();
+        this.partyA = caseEvidence.getPartyA();
+        this.partyB = caseEvidence.getPartyB();
+        this.processStatus = caseEvidence.getProcessStatus();
+        this.appendProcessing = caseEvidence.getAppendProcessing();
+        this.title = caseEvidence.getTitle();
+        this.directoryId = caseEvidence.getDirectoryId();
+        this.property = caseEvidence.getProperty();
+    }
+
+    public void setDirectoryNamePathValue(EvidenceDirectoryDTO rootDirectory) {
+        if (StrUtil.isNotEmpty(this.directoryId)){
+            List<String> directoryPath = rootDirectory.getDirectoryPath(this.directoryId);
+            if (CollUtil.isNotEmpty(directoryPath)){
+                this.directoryNamePath = StrUtil.join("-", directoryPath);
+            }
+
         }
     }
 }

src/main/java/com/supervision/police/dto/EvidenceDirectoryDTO.java

@@ -51,7 +51,7 @@ public class EvidenceDirectoryDTO {
      * 证据信息，供前端使用。level为 1、2 级时evidenceInfo为空。为3级时不为空，
      * 且与fileInfoList[evidenceInfo]保持一致
      */
-    private CaseEvidence evidenceInfo;
+    private CaseEvidenceDTO evidenceInfo;
 
     private int level = -1;
 
@@ -209,7 +209,7 @@ public class EvidenceDirectoryDTO {
 
     }
 
-    public void setFileEvidence(Map<String, CaseEvidence> caseEvidenceMap,Map<String, CategoryPromptDTO> categoryPromptMap){
+    public void setFileEvidence(Map<String, CaseEvidenceDTO> caseEvidenceMap,Map<String, CategoryPromptDTO> categoryPromptMap){
         if (CollUtil.isNotEmpty(this.getChild())){
             for (EvidenceDirectoryDTO directoryDTO : this.child) {
                 directoryDTO.setFileEvidence(caseEvidenceMap,categoryPromptMap);

src/main/java/com/supervision/police/dto/EvidenceFileDTO.java

@@ -52,7 +52,7 @@ public class EvidenceFileDTO {
      * 案件证据信息
      * 当证据在二级目录时，一个看作一个证据，当证据在三级目录时一个目录看作一个整体的证据
      */
-    private CaseEvidence evidenceInfo;
+    private CaseEvidenceDTO evidenceInfo;
 
 
     /**

src/main/java/com/supervision/police/service/impl/CaseEvidenceServiceImpl.java

@@ -119,12 +119,6 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
         });
         caseStatusManageService.whenUpdateEvidence(caseEvidenceDTO.getCaseId());
 
-        // 更新证据属性信息
-        for (String fileId : caseEvidenceDTO.getFileIdList()) {
-            caseEvidenceDTO.setTitleProperty();
-            ocrEvidenceService.saveEvidenceProperty(caseEvidence.getId(), fileId, caseEvidenceDTO.getProperty());
-        }
-
         return caseEvidenceDTO.getId();
     }
 
@@ -818,7 +812,7 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
                     evidenceVerifyDTO.setEvidenceId(fileDTO.getEvidenceId());
                     evidenceVerifyDTO.setFileId(fileDTO.getFileId());
                     evidenceVerifyDTO.setOcrText(fileDTO.getOcrText());
-                    CaseEvidence evidenceInfo = fileDTO.getEvidenceInfo();
+                    CaseEvidenceDTO evidenceInfo = fileDTO.getEvidenceInfo();
                     if (null != evidenceInfo) {
                         evidenceVerifyDTO.setProperties(evidenceInfo.getProperty());
                         evidenceVerifyDTO.setTitle(evidenceInfo.getTitle());
@@ -843,8 +837,9 @@ public class CaseEvidenceServiceImpl extends ServiceImpl<CaseEvidenceMapper, Cas
         // 强行翻译
         rebuildEvidenceProperties(new EvidenceDirectoryDTO(evidenceDirectoryDTOS), caseEvidenceList);
 
+        EvidenceDirectoryDTO rootDirectory = new EvidenceDirectoryDTO(evidenceDirectoryDTOS);
         List<CategoryPromptDTO> categoryPromptDTOS = evidenceDirectoryService.listCategoryPrompt(caseId);
-        Map<String, CaseEvidence> caseEvidenceMap = caseEvidenceList.stream().collect(Collectors.toMap(CaseEvidence::getId, Function.identity()));
+        Map<String, CaseEvidenceDTO> caseEvidenceMap = caseEvidenceList.stream().map(CaseEvidenceDTO::new).peek(e->e.setDirectoryNamePathValue(rootDirectory)).collect(Collectors.toMap(CaseEvidenceDTO::getId, Function.identity()));
         Map<String, CategoryPromptDTO> categoryPromptMap = categoryPromptDTOS.stream().collect(Collectors.toMap(CategoryPromptDTO::getDirectoryId, k -> k, (v1, v2) -> v1));
 
         Iterator<EvidenceDirectoryDTO> iterator = evidenceDirectoryDTOS.iterator();