chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码。

This commit is contained in:
chenxudong 2025-05-12 10:35:58 +08:00
parent b0c6633d87
commit 30df466f35
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

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