From df763a94c93bbf7123663360a090c39da5d0149a Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 16 Apr 2025 11:41:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=87=E4=BB=B6copy?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 11480c0..996c226 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
@@ -1120,7 +1120,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         Assert.isTrue(FileRepeatEnum.contains(strategy), "解决重名文件参数错误");
         // 获取原文件mysql模型
         EdFileInfo srcFileInfo = this.baseMapper.selectById(id);
-        String srcFileDbPath = srcFileInfo.getFilePath();
         // 判断目标路径下是否有同名文件，如果所有的同名文件：1）如果所有文件都已经被作废，则该文件为新文件，版本号从100开始。2）如果有没有被作废的文件，则冲突处理方式按---1-跳过冲突文件 2-做版本更新 3-重命名，文件名加"_1"
         long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getParentId, targetFolderId)
@@ -1145,6 +1144,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + destFileInfo.getId())
                     .setFileCode(newFileCode);
             this.baseMapper.insert(destFileInfo);
+            String srcPath = commonService.getFileSysPath(srcFileInfo.getId());
+            String destPath = commonService.getFileSysPath(destFileInfo.getId());
+            fileSystemService.copyFile(srcPath, destPath);
         } else {
             destFileInfo = handCopyConflict(targetFolderId, strategy, srcFileInfo, destFolderInfo, dataOwnCode);
         }
@@ -1252,6 +1254,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .eq(EdFileInfo::getFileName, srcFileInfo.getFileName())
                     .eq(EdFileInfo::getFileType, srcFileInfo.getFileType()).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
             this.baseMapper.insert(destSaveFileInfo);
+            String srcPath = commonService.getFileSysPath(srcFileInfo.getId());
+            String destPath = commonService.getFileSysPath(destSaveFileInfo.getId());
+            fileSystemService.copyFile(srcPath, destPath);
             return destSaveFileInfo;
         } else {
             // 文件名加“_1”，版本号从100开始
@@ -1266,6 +1271,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId());
             resetFileInfoName(newEdFileInfo);
             this.baseMapper.insert(newEdFileInfo);
+            String srcPath = commonService.getFileSysPath(srcFileInfo.getId());
+            String destPath = commonService.getFileSysPath(newEdFileInfo.getId());
+            fileSystemService.copyFile(srcPath, destPath);
             return newEdFileInfo;
         }
     }