From 239b93e42106bac5f2ec5e158bc2763dd04ad8ca Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Tue, 4 Jun 2024 17:06:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=89=8D=E7=AB=AF=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=EF=BC=8C=E6=8F=90=E4=BE=9B=E6=96=87=E4=BB=B6=E5=8E=9F?=
 =?UTF-8?q?=E5=A7=8B=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/system/SysOssController.java        | 1 +
 .../java/org/dromara/system/domain/vo/SysOssUploadVo.java | 5 +++++
 .../main/java/org/dromara/system/domain/vo/SysOssVo.java  | 5 +++++
 .../dromara/system/service/impl/SysOssServiceImpl.java    | 8 +++++---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
index c9707b6..1a0f8f3 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -74,6 +74,7 @@ public class SysOssController extends BaseController {
         SysOssVo oss = ossService.upload(file);
         SysOssUploadVo uploadVo = new SysOssUploadVo();
         uploadVo.setUrl(oss.getUrl());
+        uploadVo.setFileName(oss.getOriginalName());
         uploadVo.setOssId(oss.getOssId().toString());
         return R.ok(uploadVo);
     }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
index 09c2e1f..cf87fdc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
@@ -20,4 +20,9 @@ public class SysOssUploadVo {
      */
     private String ossId;
 
+    /**
+     * 文件名
+     */
+    private String fileName;
+
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
index 88858a8..8d5c429 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
@@ -32,6 +32,11 @@ public class SysOssVo implements Serializable {
      */
     private String fileName;
 
+    /**
+     * 原名
+     */
+    private String originalName;
+
     /**
      * 文件后缀名
      */
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 31a4137..99a8abe 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -195,6 +195,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
             md5 = DigestUtils.md5Hex(file.getInputStream());
             SysOssVo byMd5 = this.getByMd5(md5);
             if (ObjectUtil.isNotNull(byMd5)) {
+                byMd5.setOriginalName(originalfileName);
                 return byMd5;
             }
             uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
@@ -202,7 +203,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
             throw new ServiceException(e.getMessage());
         }
         // 保存文件信息
-        return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult);
+        return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult);
     }
 
     /**
@@ -228,11 +229,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         }
         UploadResult uploadResult = storage.uploadSuffix(file, suffix);
         // 保存文件信息
-        return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult);
+        return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult);
     }
 
     @NotNull
-    private SysOssVo buildResultEntity(String md5, String suffix, String configKey, UploadResult uploadResult) {
+    private SysOssVo buildResultEntity(String originalfileName, String md5, String suffix, String configKey, UploadResult uploadResult) {
         SysOss oss = new SysOss();
         oss.setUrl(uploadResult.getUrl());
         oss.setFileSuffix(suffix);
@@ -241,6 +242,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
         oss.setFileMd5(md5);
         baseMapper.insert(oss);
         SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
+        sysOssVo.setOriginalName(originalfileName);
         return this.matchingUrl(sysOssVo);
     }