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

优化代码

This commit is contained in:
chenxudong 2025-01-10 17:37:58 +08:00
parent 21ceaf4d81
commit 066ee17887
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -141,7 +141,7 @@ public class CommonService {
return parentId + FILE_TYPE_ENUM.getOrDefault(fileType, "00") + version + timeStr; return parentId + FILE_TYPE_ENUM.getOrDefault(fileType, "00") + version + timeStr;
} }
public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery) { public List<EdFileInfo> selectAllAdminFolder(String id, boolean isAdminQuery, List<String> accessableIds) {
if (isAdminQuery) { if (isAdminQuery) {
return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
@ -149,7 +149,6 @@ public class CommonService {
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
.eq(EdFileInfo::getParentId, id)); .eq(EdFileInfo::getParentId, id));
} }
List<String> accessableIds = permissionService.getAccessibleTree();
return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) return edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code) .eq(EdFileInfo::getDataType, EleDataTypeEnum.FOLDER.code)
@ -239,7 +238,7 @@ public class CommonService {
List<String> projectVOS = new ArrayList<>(); List<String> projectVOS = new ArrayList<>();
for (String id : ids) { for (String id : ids) {
List<EdFileInfo> edFileInfos = selectAllAdminFolder(id, isAdminQuery); List<EdFileInfo> edFileInfos = selectAllAdminFolder(id, isAdminQuery, prjIds);
if (!isAdminQuery) { if (!isAdminQuery) {
edFileInfos = edFileInfos.stream().filter(e -> e.getDataStatus().equals(EleDataStatusEnum.PUBLISHED.code)).collect(Collectors.toList()); edFileInfos = edFileInfos.stream().filter(e -> e.getDataStatus().equals(EleDataStatusEnum.PUBLISHED.code)).collect(Collectors.toList());
} else { } else {

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -322,8 +322,8 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
String currentUserId = UserThreadLocal.getUserId(); String currentUserId = UserThreadLocal.getUserId();
// 把source工程的层级结构copy到目标工程 // 把source工程的层级结构copy到目标工程
// 查找source的全部目录 // 查找source的全部目录
List<EdFileInfo> sourceEdFileInfos = commonService.selectAllAdminFolder(sourceId, true); List<EdFileInfo> sourceEdFileInfos = commonService.selectAllAdminFolder(sourceId, true, null);
List<EdFileInfo> targetEdFileInfos = commonService.selectAllAdminFolder(targetId, true); List<EdFileInfo> targetEdFileInfos = commonService.selectAllAdminFolder(targetId, true, null);
List<String> needSavePaths = new ArrayList<>(); List<String> needSavePaths = new ArrayList<>();
// 确定层级最大为prjFolderMaxLength层，现在逐层来处理。 // 确定层级最大为prjFolderMaxLength层，现在逐层来处理。
for (int i = 1; i <= prjFolderMaxLength; ++i) { for (int i = 1; i <= prjFolderMaxLength; ++i) {