From b67273f228de71393d07288da9bdedf290486085 Mon Sep 17 00:00:00 2001 From: Odboy Date: Tue, 25 Mar 2025 22:03:01 +0800 Subject: [PATCH] =?UTF-8?q?upd:=20=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/mapper/RoleMapper.java | 20 +++++++-------- .../system/service/impl/DeptServiceImpl.java | 2 +- .../system/service/impl/RoleServiceImpl.java | 18 ++++++------- .../src/main/resources/mapper/RoleMapper.xml | 25 ++++++++----------- 4 files changed, 29 insertions(+), 36 deletions(-) diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/RoleMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/RoleMapper.java index 996fa58b..c9fa3dea 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/RoleMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/RoleMapper.java @@ -12,14 +12,12 @@ import java.util.Set; @Mapper public interface RoleMapper extends BaseMapper { - List selectByPage(); - Long countByCriteria(@Param("criteria") RoleQueryCriteria criteria); - List selectByPage(@Param("criteria") RoleQueryCriteria criteria); - Role selectById(@Param("roleId") Long roleId); - Role selectByName(@Param("name") String name); - List selectByUserId(@Param("userId") Long userId); - int countByDeptIds(@Param("deptIds") Set deptIds); - @Select("SELECT role.role_id as id FROM sys_role role, sys_roles_menus rm WHERE role.role_id = rm.role_id AND rm.menu_id = #{menuId}") - List selectByMenuId(@Param("menuId") Long menuId); - -} + List findAllRoles(); + Long countRoles(@Param("criteria") RoleQueryCriteria criteria); + List findRoles(@Param("criteria") RoleQueryCriteria criteria); + Role findRoleById(@Param("roleId") Long roleId); + Role findRoleByName(@Param("name") String name); + List findRolesByUserId(@Param("userId") Long userId); + int countRolesByDeptIds(@Param("deptIds") Set deptIds); + List findRolesByMenuId(@Param("menuId") Long menuId); +} \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java index b0c0f0f2..34ad706e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java @@ -226,7 +226,7 @@ public class DeptServiceImpl extends ServiceImpl implements De if (userMapper.countByDepts(deptIds) > 0) { throw new BadRequestException("所选部门存在用户关联，请解除后再试！"); } - if (roleMapper.countByDeptIds(deptIds) > 0) { + if (roleMapper.countRolesByDeptIds(deptIds) > 0) { throw new BadRequestException("所选部门存在角色关联，请解除后再试！"); } } diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java index 7e86b0c2..73db6eb8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java @@ -45,19 +45,19 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public List queryAll() { - return roleMapper.selectByPage(); + return roleMapper.findAllRoles(); } @Override public List queryAll(RoleQueryCriteria criteria) { - return roleMapper.selectByPage(criteria); + return roleMapper.findRoles(criteria); } @Override public PageResult queryAll(RoleQueryCriteria criteria, Page page) { criteria.setOffset(page.offset()); - List roles = roleMapper.selectByPage(criteria); - Long total = roleMapper.countByCriteria(criteria); + List roles = roleMapper.findRoles(criteria); + Long total = roleMapper.countRoles(criteria); return PageUtil.toPage(roles, total); } @@ -75,7 +75,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override @Transactional(rollbackFor = Exception.class) public void create(Role resources) { - if (roleMapper.selectByName(resources.getName()) != null) { + if (roleMapper.findRoleByName(resources.getName()) != null) { throw new EntityExistException(Role.class, "username", resources.getName()); } save(resources); @@ -89,7 +89,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Transactional(rollbackFor = Exception.class) public void update(Role resources) { Role role = getById(resources.getId()); - Role role1 = roleMapper.selectByName(resources.getName()); + Role role1 = roleMapper.findRoleByName(resources.getName()); if (role1 != null && !role1.getId().equals(role.getId())) { throw new EntityExistException(Role.class, "username", resources.getName()); } @@ -141,7 +141,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro String key = CacheKey.ROLE_USER + userId; List roles = redisUtil.getList(key, Role.class); if (CollUtil.isEmpty(roles)) { - roles = roleMapper.selectByUserId(userId); + roles = roleMapper.findRolesByUserId(userId); redisUtil.set(key, roles, 1, TimeUnit.DAYS); } return roles; @@ -171,7 +171,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro return permissions.stream().map(AuthorityDto::new) .collect(Collectors.toList()); } - List roles = roleMapper.selectByUserId(user.getId()); + List roles = roleMapper.findRolesByUserId(user.getId()); permissions = roles.stream().flatMap(role -> role.getMenus().stream()) .map(Menu::getPermission) .filter(StringUtil::isNotBlank).collect(Collectors.toSet()); @@ -205,7 +205,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro @Override public List findByMenuId(Long menuId) { - return roleMapper.selectByMenuId(menuId); + return roleMapper.findRolesByMenuId(menuId); } /** diff --git a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml index 60d2c0ce..2f340c41 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml @@ -21,14 +21,11 @@ - - - select role_id as id, name, level from sys_role order by level - - select role.*, dept.dept_id as dept_id, dept.name as dept_name, menu.menu_id as menu_id, menu.title as menu_title, menu.permission as menu_permission @@ -60,8 +57,7 @@ left join sys_dept dept on dept.dept_id = srd.dept_id order by role.role_level - - select count(*) from sys_role role @@ -76,13 +72,11 @@ - - select role_id as id from sys_role where name = #{name} - - select role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope, role.level as role_level, role.description as role_description, role.create_by as role_create_by, @@ -96,8 +90,7 @@ left join sys_dept dept on dept.dept_id = srd.dept_id where role.role_id = #{roleId} - - SELECT role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope, role.level as role_level, role.description as role_description, role.create_by as role_create_by, @@ -112,8 +105,7 @@ left join sys_users_roles ur on role.role_id = ur.role_id WHERE role.role_id = ur.role_id AND ur.user_id = #{userId} - - select count(*) from sys_role r, sys_roles_depts d where r.role_id = d.role_id @@ -122,4 +114,7 @@ #{deptId} + \ No newline at end of file