From ec20f9d7d56ba6edf8e58ddeeb7cd7bbb77182a1 Mon Sep 17 00:00:00 2001 From: hejinbo Date: Wed, 25 Oct 2023 16:56:37 +0800 Subject: [PATCH] =?UTF-8?q?10.25=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 4 ++-- .../domain/CaseEvidenceDirectory.java | 9 +++++++ .../domain/vo/CaseEvidenceDirectoryVO.java | 24 +++++++++++++++++++ .../service/impl/AdjudicationServiceImpl.java | 3 +-- .../service/impl/CaseEvidenceServiceImpl.java | 13 ++++++++++ .../CaseEvidenceDirectoryMapper.xml | 24 +++++++++++-------- 6 files changed, 63 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 54afe82..3501493 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/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: diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java index a6aead9..57c29de 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/CaseEvidenceDirectory.java @@ -48,4 +48,13 @@ public class CaseEvidenceDirectory extends BaseEntity { /** 子目录 */ private List children = new ArrayList<>(); + + /** + * 附件名称 + */ + private String annexName; + /** + * 附件路径 + */ + private String annexPath; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java index 56c0ab9..51e0d62 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/CaseEvidenceDirectoryVO.java +++ b/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 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(); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java index 458961e..0171dd3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/AdjudicationServiceImpl.java +++ b/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 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java index 36618ce..6d6c78b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/impl/CaseEvidenceServiceImpl.java @@ -313,6 +313,19 @@ public class CaseEvidenceServiceImpl implements ICaseEvidenceService { List returnList = new ArrayList<>(); List 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); diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceDirectoryMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceDirectoryMapper.xml index f73c072..7f01efb 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceDirectoryMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/CaseEvidenceDirectoryMapper.xml @@ -14,6 +14,8 @@ + + @@ -36,28 +38,30 @@ )