From 28b6c4f772a1e09f84ee232b2c8b63aff0566101 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Fri, 27 Dec 2024 09:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E9=80=9A=E4=BA=86=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 f64e125..03c6548 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
@@ -677,16 +677,19 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             // 处理MySQL相关逻辑
             EdFileInfo newEdFileInfo = BeanUtil.copyProperties(srcFileInfo, EdFileInfo.class);
             newEdFileInfo.newInit();
+            String dbPathByDbPath = commonService.getCodePathByDbPath(destFolderInfo.getFilePath());
             newEdFileInfo.setParentId(targetFolderId)
                     .setFileVersion(FILE_START_VERSION)
                     .setFileName(srcFileInfo.getFileName() + "_1")
-                    .setFileCode(commonService.createFileCode(targetFolderId, srcFileInfo.getFileType(), FILE_START_VERSION, newEdFileInfo.getFileTime()))
+                    .setFileCode(commonService.createFileCode(dbPathByDbPath, srcFileInfo.getFileType(), FILE_START_VERSION, newEdFileInfo.getFileTime()))
                     .setFilePath(destFolderInfo.getFilePath() + MYSQL_FILE_PATH_SPLIT + newEdFileInfo.getId());
+            resetFileInfoName(newEdFileInfo);
             this.baseMapper.insert(newEdFileInfo);
             // 移动文件
             String srcFileSysPath = commonService.getFileSysPath(srcFileInfo.getFilePath());
-            String destFileSysPath = commonService.getFileSysPath(destFolderInfo.getFilePath());
+            String destFileSysPath = commonService.getFileSysPath(newEdFileInfo.getFilePath());
             fileSystemService.moveFile(srcFileSysPath, destFileSysPath, deleteSrc);
+            this.baseMapper.deleteById(srcFileInfo.getId());
         }
         return ElectromagneticResultUtil.success(true);
     }