10.25开发

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java

@@ -48,4 +48,13 @@ public class CaseEvidenceDirectory extends BaseEntity {
 
     /** 子目录 */
     private List<CaseEvidenceDirectory> children = new ArrayList<>();
+
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件路径
+     */
+    private String annexPath;
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java

@@ -46,6 +46,15 @@ public class CaseEvidenceDirectoryVO implements Serializable {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<CaseEvidenceDirectory> children;
 
+    /**
+     * 附件名称
+     */
+    private String annexName;
+    /**
+     * 附件路径
+     */
+    private String annexPath;
+
     /**
      * 创建时间
      */
@@ -159,6 +168,19 @@ public class CaseEvidenceDirectoryVO implements Serializable {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+    public String getAnnexName() {
+        return annexName;
+    }
+
+    public void setAnnexName(String annexName) {
+        this.annexName = annexName;
+    }
+
+
+    public void setAnnexPath(String annexPath) {
+        this.annexPath = annexPath;
+    }
+
 
     public CaseEvidenceDirectoryVO(CaseEvidenceDirectory caseEvidenceDirectory) {
         this.id = caseEvidenceDirectory.getId();
@@ -172,5 +194,7 @@ public class CaseEvidenceDirectoryVO implements Serializable {
         this.createBy = caseEvidenceDirectory.getCreateBy();
         this.updateBy = caseEvidenceDirectory.getUpdateBy();
         this.updateTime = caseEvidenceDirectory.getUpdateTime();
+        this.annexName = caseEvidenceDirectory.getAnnexName();
+        this.annexPath = caseEvidenceDirectory.getAnnexPath();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java

@@ -293,9 +293,8 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
             }
             return AjaxResult.success("裁决书已生成");
         } catch (IOException e) {
-            e.printStackTrace();
+            return AjaxResult.error(e+"请检查文件路径是否有误");
         }
-        return null;
     }
 
     @Override

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java

@@ -313,6 +313,19 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService {
         List<CaseEvidenceDirectory> returnList = new ArrayList<>();
         List<Long> tempList = caseEvidenceDirectorys.stream().map(CaseEvidenceDirectory::getId).collect(Collectors.toList());
         for (CaseEvidenceDirectory caseEvidenceDirectory : caseEvidenceDirectorys) {
+            String annexName = caseEvidenceDirectory.getAnnexName();
+            if (annexName!=null){
+                String prefix = "/profile";
+                int startIndex = annexName.indexOf(prefix);
+                startIndex += prefix.length();
+                String annexPath = "/uploadPath" + annexName.substring(startIndex);
+                caseEvidenceDirectory.setAnnexPath(annexPath);
+                int startIndexnew = annexName.lastIndexOf("/");
+                if(startIndexnew!=-1){
+                    String annexNamenew  = annexName.substring(startIndexnew+1);
+                    caseEvidenceDirectory.setAnnexName(annexNamenew);
+                }
+            }
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(caseEvidenceDirectory.getParentId())) {
                 recursionFn(caseEvidenceDirectorys, caseEvidenceDirectory);