Merge branch 'hjb' of SH-Arbitrate/Arbitrate-Backend into dev

ruoyi-admin/src/main/resources/application.yml

@@ -58,9 +58,9 @@ spring:
   servlet:
     multipart:
       # 单个文件大小
-      max-file-size: 10MB
+      max-file-size: 50MB
       # 设置总上传的文件大小
-      max-request-size: 20MB
+      max-request-size: 500MB
   # 服务模块
   devtools:
     restart:

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);

ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceDirectoryMapper.xml

@@ -14,6 +14,8 @@
         <result property="updateTime"     column="update_time"    />
         <result property="createBy"     column="create_by"    />
         <result property="updateBy"     column="update_by"    />
+        <result property="annexName"     column="annex_name"    />
+        <result property="annexPath"     column="annex_path"    />
     </resultMap>
     <insert id="save" parameterType="CaseEvidenceDirectory" useGeneratedKeys="true" keyProperty="id">
 
@@ -36,28 +38,30 @@
         )
     </insert>
     <select id="selectList" parameterType="CaseEvidenceDirectory" resultMap="CaseEvidenceDirectoryResult">
-        select id,parent_id,evidence_name,annex_id,series,create_time,update_time,case_appli_id,create_by,update_by
-        from case_evidence_directory
-        <where>
+        select ced.id,ced.parent_id,ced.evidence_name,ced.annex_id,ced.series,ced.create_time
+             ,ced.update_time,ced.case_appli_id,ced.create_by,ced.update_by,ca.annex_name,ca.annex_path
+        from case_evidence_directory ced
+        left join case_attach ca on ced.annex_id = ca.annex_id
+            <where>
             <if test="id != null ">
-                AND id = #{id}
+                AND ced.id = #{id}
             </if>
             <if test="parentId != null ">
-                AND parent_id = #{parentId}
+                AND ced.parent_id = #{parentId}
             </if>
             <if test="evidenceName != null ">
-                AND evidence_name = #{evidenceName}
+                AND ced.evidence_name = #{evidenceName}
             </if>
             <if test="annexId != null ">
-                AND annex_id = #{annexId}
+                AND ced.annex_id = #{annexId}
             </if>
             <if test="series != null ">
-                AND series = #{series}
+                AND ced.series = #{series}
             </if>
             <if test="caseId != null ">
-                AND case_appli_id = #{caseId}
+                AND ced.case_appli_id = #{caseId}
             </if>
-            order by case_evidence_directory.parent_id
+            order by ced.parent_id
         </where>
     </select>