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

Merge branch 'develop' of http://139.196.179.195:3000/chenxudong/electromagnetic-data-new into develop

This commit is contained in:
chenxudong 2025-03-24 14:08:41 +08:00
parent d9ffa2438d bea84f57c2
commit 5fd43452de
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java
View File

@ -76,7 +76,7 @@ public class FileFormatServiceImpl extends ServiceImpl<FileFormatMapper, FileFor
*/ */
@Override @Override
public List<FileFormatVO> getList() { public List<FileFormatVO> getList() {
List<FileFormat> fileFormats = this.baseMapper.selectList(Wrappers.<FileFormat>lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByDesc(FileFormat::getCreatedTime)); List<FileFormat> fileFormats = this.baseMapper.selectList(Wrappers.<FileFormat>lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByAsc(FileFormat::getSuffixNo));
List<FileFormatVO> fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class); List<FileFormatVO> fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class);
UserThreadLocal.setSuccessInfo("", "", "查询了文件格式列表"); UserThreadLocal.setSuccessInfo("", "", "查询了文件格式列表");
return fileFormatVOS; return fileFormatVOS;

20
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java
View File

@ -166,7 +166,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
roleDTO.setRoleName(role.getRoleName()); roleDTO.setRoleName(role.getRoleName());
roleDTO.setRoleDesc(role.getRoleDesc()); roleDTO.setRoleDesc(role.getRoleDesc());
List<EdFileInfo> infos = getFiles(DataOwnEnum.SYS_PRJ.code); List<EdFileInfo> infos = getSysAndRepo();
List<RolePermissionDTO> nodes = new ArrayList<>(); List<RolePermissionDTO> nodes = new ArrayList<>();
for (EdFileInfo info : infos) { for (EdFileInfo info : infos) {
@ -271,11 +271,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override @Override
public RoleDTO getRoleTemplate() { public RoleDTO getRoleTemplate() {
RoleDTO roleDTO = new RoleDTO(); RoleDTO roleDTO = new RoleDTO();
List<EdFileInfo> infos = getSysAndRepo();
List<EdFileInfo> sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code);
List<EdFileInfo> repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code);
List<EdFileInfo> infos = new ArrayList<>(sysInfos);
infos.addAll(repoInfos);
List<RolePermissionDTO> nodes = new ArrayList<>(); List<RolePermissionDTO> nodes = new ArrayList<>();
for (EdFileInfo info : infos) { for (EdFileInfo info : infos) {
RolePermissionDTO rolePermissionDTO = new RolePermissionDTO(); RolePermissionDTO rolePermissionDTO = new RolePermissionDTO();
@ -380,5 +376,17 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
.or() .or()
.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code))); .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.WAIT_DELETED.code)));
} }
/**
* 获取系统层级和库层级
* @return
*/
private List<EdFileInfo> getSysAndRepo() {
List<EdFileInfo> sysInfos = getFiles(DataOwnEnum.SYS_PRJ.code);
List<EdFileInfo> repoInfos = getFiles(DataOwnEnum.REPO_PRJ.code);
List<EdFileInfo> infos = new ArrayList<>(sysInfos);
infos.addAll(repoInfos);
return infos;
}
} }