From b0c6633d87cc12a1b4d97bc4e7ba9c6d89833503 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 12 May 2025 10:13:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=81=87=E5=88=B0=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/serviceimpl/CommonService.java | 4 ++--
 .../manage/service/serviceimpl/EdFileInfoServiceImpl.java  | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
index 90498d8..c316ffd 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
@@ -844,7 +844,7 @@ public class CommonService {
                     }
                 }
             }
-            UserThreadLocal.setSuccessInfo("", targetId, "层级沿用成功");
+            UserThreadLocal.setSuccessInfo("", targetId, "层级沿用成功，源工程id {}，目标工程id {}，", sourceId, targetId);
             return ElectromagneticResultUtil.success(true);
         } catch (Exception e) {
             String info = StrFormatter.format("层级沿用失败，源工程 {}，目标工程 {}，原因 {}", sourceId, targetId, e.getMessage());
@@ -877,7 +877,7 @@ public class CommonService {
                     .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code)
                     .likeRight(EdFileInfo::getFilePath, prjId);
             edFileInfoMapper.update(new EdFileInfo(), updateWrapper);
-            UserThreadLocal.setSuccessInfo("", prjId, "项目 {} 发布成功", fileInfo.getFileName());
+            UserThreadLocal.setSuccessInfo("", prjId, "项目 {} 发布成功， 项目id {}", fileInfo.getFileName(), prjId);
             return ElectromagneticResultUtil.success(true);
         } catch (Exception e) {
             String info = StrFormatter.format("项目 {} 发布异常", fileInfo.getFileName());
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 ef52ce0..b326779 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
@@ -1571,7 +1571,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         String orgName = file.getOriginalFilename();
         String tmpZipFile = elePropertyConfig.getEleTmpPath() + File.separator + orgName;
         String mainName = FileUtil.mainName(orgName);
-        String suffix = FileUtil.getSuffix(orgName);
         FileUtil.del(tmpZipFile);
         FileUtil.writeFromStream(file.getInputStream(), tmpZipFile);
         String destDir = elePropertyConfig.getEleTmpPath() + File.separator + IdUtil.fastSimpleUUID();
@@ -1606,9 +1605,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         for (File importFile : files) {
             String parentDir = FileUtil.normalize(importFile.getParent());
             String relativeFilePath = parentDir.replace(tmpPath, "");
-            while (relativeFilePath.startsWith(File.separator)) {
-                relativeFilePath = relativeFilePath.substring(1);
-            }
             String fileType = FileUtil.getSuffix(importFile.getName());
             relativeFilePath = relativeFilePath.startsWith("/") ? relativeFilePath.substring(1) : relativeFilePath;
             relativeFilePath = relativeFilePath.replace("/", MYSQL_FILE_PATH_SPLIT);
@@ -1621,7 +1617,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                     .setFileCode(fileCode)
                     .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
                     .setDataOwn(DataOwnEnum.SYS_FILE.code)
-                    .setFileName(importFile.getName())
+                    .setFileName(FileUtil.mainName(importFile))
                     .setFileContent(EleCommonUtil.parse(FileUtil.getInputStream(importFile), fileType))
                     .setFileType(fileType)
                     .setFileVersion(FILE_START_VERSION)
@@ -1634,6 +1630,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             String destPath = commonService.getPrjRootPath1(DataOwnEnum.SYS_FILE.code) + File.separator + newEdFileInfo.getId();
             FileUtil.move(importFile, new File(destPath), false);
             EleCommonUtil.encryptFile(destPath, SecureUtil.aes(FILE_SEC_PASSWD.getBytes()));
+            UserThreadLocal.setSuccessInfo(newEdFileInfo.getParentId(), newEdFileInfo.getId(), "解析导入的工程文件成功，导入的工程名为 {}，文件名为 {}", orgName, importFile.getName());
         }
     }