smart-flow/ruoyi-vue-pro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. RoleDO 字段的调整和优化

Browse Source 
2. 初始化 Role 模块相关接口的 VO 类
This commit is contained in:
YunaiV
2021-01-09 00:32:04 +08:00
parent 3e5bd01962
commit 4c3e2bd815
28 changed files with 399 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java
View File

@@ -1,9 +1,9 @@
package cn.iocoder.dashboard.modules.system.service.permission;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuCreateReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuListReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuRespVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuUpdateReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
import java.util.Collection;

8
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
View File

@@ -1,10 +1,10 @@
package cn.iocoder.dashboard.modules.system.service.permission.impl;
import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuCreateReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuListReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuRespVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.SysMenuUpdateReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysMenuMapper;
import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;

10
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
View File

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMapper;
import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
import cn.iocoder.dashboard.modules.system.enums.permission.RoleKeyEnum;
import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum;
import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
import com.google.common.collect.ImmutableMap;
import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,7 @@ public class SysRoleServiceImpl implements SysRoleService {
/**
* 角色缓存
* key：角色编号 {@link SysRoleDO#getRoleId()}
* key：角色编号 {@link SysRoleDO#getId()}
*
* 这里声明 volatile 修饰的原因是，每次刷新时，直接修改指向
*/
@@ -45,7 +45,7 @@ public class SysRoleServiceImpl implements SysRoleService {
List<SysRoleDO> roleDOList = roleMapper.selectList(null);
// 写入缓存
ImmutableMap.Builder<Long, SysRoleDO> builder = ImmutableMap.builder();
roleDOList.forEach(sysRoleDO -> builder.put(sysRoleDO.getRoleId(), sysRoleDO));
roleDOList.forEach(sysRoleDO -> builder.put(sysRoleDO.getId(), sysRoleDO));
roleCache = builder.build();
log.info("[init][初始化 Role 数量为 {}]", roleDOList.size());
}
@@ -55,7 +55,7 @@ public class SysRoleServiceImpl implements SysRoleService {
if (CollectionUtil.isEmpty(roleIds)) {
return Collections.emptyList();
}
return roleCache.values().stream().filter(roleDO -> roleIds.contains(roleDO.getRoleId()))
return roleCache.values().stream().filter(roleDO -> roleIds.contains(roleDO.getId()))
.collect(Collectors.toList());
}
@@ -64,7 +64,7 @@ public class SysRoleServiceImpl implements SysRoleService {
if (CollectionUtil.isEmpty(roleList)) {
return false;
}
return roleList.stream().anyMatch(roleDO -> RoleKeyEnum.ADMIN.getKey().equals(roleDO.getRoleKey()));
return roleList.stream().anyMatch(roleDO -> RoleCodeEnum.ADMIN.getKey().equals(roleDO.getCode()));
}
}