From 30df466f35b8f6952ae79e09bad3c1dc4a6eda5a Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 12 May 2025 10:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 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 b326779..540f053 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
@@ -1530,7 +1530,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             // 添加所有权限
             addRoleAndPermission(prjId);
         } catch (Exception e) {
-            String info = "导入失败";
+            String info = "导入失败，原因 " + e.getMessage();
             log.error(info, e);
             throw new BizException(info, e);
         }
@@ -1581,11 +1581,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         }
 
         File file1 = Objects.requireNonNull(new File(destDir).listFiles())[0];
-        if (!StrUtil.equals(file1.getName(), mainName)) {
-            FileUtil.rename(file1, mainName, true);
-        }
-
-        List<File> files = FileUtil.loopFiles(destDir);
+        FileUtil.rename(file1, mainName, true);
         List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
                 .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
                 .likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT)
@@ -1601,6 +1597,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             }
             filePathMap.put(names.substring(1), edFileInfo);
         }
+
+        List<File> files = FileUtil.loopFiles(destDir);
         String tmpPath = FileUtil.normalize(destDir);
         for (File importFile : files) {
             String parentDir = FileUtil.normalize(importFile.getParent());
@@ -1609,6 +1607,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
             relativeFilePath = relativeFilePath.startsWith("/") ? relativeFilePath.substring(1) : relativeFilePath;
             relativeFilePath = relativeFilePath.replace("/", MYSQL_FILE_PATH_SPLIT);
             EdFileInfo edFileInfo = filePathMap.get(relativeFilePath);
+            Assert.notNull(edFileInfo, "导入的工程与定义的层级结构不一致");
             String id = edFileInfo.getId();
             EdFileInfo newEdFileInfo = new EdFileInfo();
             newEdFileInfo.newInit();