From 55bc397f9e16b17c35c583d719c1fdf03f7e6ff8 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 21 Feb 2025 17:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
index 539aa1d..ab8c008 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
@@ -736,6 +736,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String mainName = FileUtil.mainName(fileName);
         String suffix = FileUtil.getSuffix(fileName);
         EdFileInfo newEdFileInfo = new EdFileInfo();
+        EdFileInfo finalEdFileInfo = null;
         newEdFileInfo.newInit();
         // 首先检查是否是同名文件
         try {
@@ -746,7 +747,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                     .eq(EdFileInfo::getFileType, suffix));
             if (count > 0) {
-                handUploadRepeatFile(parentId, file, strategy, dataOwnCode);
+                finalEdFileInfo = handUploadRepeatFile(parentId, file, strategy, dataOwnCode);
             } else {
                 EdFileInfo parentFolderInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)
                         .eq(EdFileInfo::getId, parentId)
@@ -772,6 +773,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
                 FileUtil.writeFromStream(file.getInputStream(), fileDestPath);
                 EleCommonUtil.encryptFile(fileDestPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
+                finalEdFileInfo = newEdFileInfo;
 //                fileSystemService.save(FileUtil.getInputStream(fileDestPath), fileDestPath); // 这里会导致文件大小为0，考虑到当前的系统为OS文件系统，暂不处理
             }
         } catch (Exception e) {
@@ -789,7 +791,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             log.error(info, e);
             throw new BizException(info);
         }
-        UserThreadLocal.setSuccessMsg(StrFormatter.format("文件 {} 为上传到 {} 成功，同名同后缀的处理方式为 {}", fileName, destPath, strategyStr));
+        UserThreadLocal.setSuccessMsg(StrFormatter.format("文件 {} 为上传到 {} 成功，同名同后缀的处理方式为 {}，存入的文件名为 {}", fileName, destPath, strategyStr, finalEdFileInfo.getFileName()+ "." + finalEdFileInfo.getFileType()));
         return ElectromagneticResultUtil.success(true);
     }
 
@@ -1063,7 +1065,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void handUploadRepeatFile(String parentId, MultipartFile file, Integer strategy, int dataOwnCode) throws IOException {
+    public EdFileInfo handUploadRepeatFile(String parentId, MultipartFile file, Integer strategy, int dataOwnCode) throws IOException {
         Assert.isTrue(Arrays.asList(1, 2, 3).contains(strategy), "解决同名文件参数错误");
         String fileName = file.getOriginalFilename();
         String mainName = FileUtil.mainName(fileName);
@@ -1111,6 +1113,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             this.baseMapper.insert(newEdFileInfo);
             String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
             fileSystemService.save(file.getInputStream(), fileDestPath);
+            return newEdFileInfo;
         } else if (strategy == 3) {
             // 文件名加”_1“，存为新文件
             EdFileInfo parentFileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class)
@@ -1139,8 +1142,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             this.baseMapper.insert(newEdFileInfo);
             String fileDestPath = commonService.getFileSysPath(newEdFileInfo.getFilePath(), dataOwnCode);
             fileSystemService.save(file.getInputStream(), fileDestPath);
+            return newEdFileInfo;
         }
-
+        return null;
     }
 
     private String doSysFileMerge(String identifier, String fileName, Integer totalChunks) {