upd: 编码规范

This commit is contained in:
2025-04-09 19:27:58 +08:00
parent 01b2e7f040
commit 1c91a68070
3 changed files with 17 additions and 17 deletions
@@ -10,19 +10,19 @@ import java.util.Set;
@Mapper
public interface RoleMapper extends BaseMapper<Role> {
List<Role> selectRole();
List<Role> queryRoleList();
List<Role> selectRoleByCriteria(@Param("criteria") QueryRoleRequest criteria);
List<Role> queryRoleListByArgs(@Param("criteria") QueryRoleRequest criteria);
Long getRoleCountByCriteria(@Param("criteria") QueryRoleRequest criteria);
Long getRoleCountByArgs(@Param("criteria") QueryRoleRequest criteria);
Role getRoleByName(@Param("name") String name);
Role getRoleById(@Param("roleId") Long roleId);
List<Role> selectRoleByUserId(@Param("userId") Long userId);
List<Role> queryRoleListByUserId(@Param("userId") Long userId);
int getRoleCountByDeptIds(@Param("deptIds") Set<Long> deptIds);
List<Role> selectRoleByMenuId(@Param("menuId") Long menuId);
List<Role> queryRoleListByMenuId(@Param("menuId") Long menuId);
}
@@ -52,19 +52,19 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override
public List<Role> selectRole() {
return roleMapper.selectRole();
return roleMapper.queryRoleList();
}
@Override
public List<Role> selectRoleByCriteria(QueryRoleRequest criteria) {
return roleMapper.selectRoleByCriteria(criteria);
return roleMapper.queryRoleListByArgs(criteria);
}
@Override
public PageResult<Role> queryRolePage(QueryRoleRequest criteria, Page<Object> page) {
criteria.setOffset(page.offset());
List<Role> roles = roleMapper.selectRoleByCriteria(criteria);
Long total = roleMapper.getRoleCountByCriteria(criteria);
List<Role> roles = roleMapper.queryRoleListByArgs(criteria);
Long total = roleMapper.getRoleCountByArgs(criteria);
return PageUtil.toPage(roles, total);
}
@@ -148,7 +148,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
String key = SystemRedisKey.ROLE_USER + userId;
List<Role> roles = redisHelper.getList(key, Role.class);
if (CollUtil.isEmpty(roles)) {
roles = roleMapper.selectRoleByUserId(userId);
roles = roleMapper.queryRoleListByUserId(userId);
redisHelper.set(key, roles, 1, TimeUnit.DAYS);
}
return roles;
@@ -178,7 +178,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
return permissions.stream().map(RoleCodeModel::new)
.collect(Collectors.toList());
}
List<Role> roles = roleMapper.selectRoleByUserId(user.getId());
List<Role> roles = roleMapper.queryRoleListByUserId(user.getId());
permissions = roles.stream().flatMap(role -> role.getMenus().stream())
.map(Menu::getPermission)
.filter(StringUtil::isNotBlank).collect(Collectors.toSet());
@@ -212,7 +212,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override
public List<Role> selectRoleByMenuId(Long menuId) {
return roleMapper.selectRoleByMenuId(menuId);
return roleMapper.queryRoleListByMenuId(menuId);
}
/**
@@ -21,12 +21,12 @@
<result column="dept_name" property="name"/>
</collection>
</resultMap>
<select id="selectRole" resultType="cn.odboy.model.system.domain.Role">
<select id="queryRoleList" resultType="cn.odboy.model.system.domain.Role">
select role_id as id, name, level
from sys_role
order by level
</select>
<select id="selectRoleByCriteria" resultMap="BaseResultMap">
<select id="queryRoleListByArgs" resultMap="BaseResultMap">
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
@@ -58,7 +58,7 @@
left join sys_dept dept on dept.dept_id = srd.dept_id
order by role.role_level
</select>
<select id="getRoleCountByCriteria" resultType="java.lang.Long">
<select id="getRoleCountByArgs" resultType="java.lang.Long">
select count(*)
from sys_role role
<where>
@@ -100,7 +100,7 @@
left join sys_dept dept on dept.dept_id = srd.dept_id
where role.role_id = #{roleId}
</select>
<select id="selectRoleByUserId" resultMap="BaseResultMap">
<select id="queryRoleListByUserId" resultMap="BaseResultMap">
SELECT role.role_id as role_role_id,
role.name as role_name,
role.data_scope as role_data_scope,
@@ -133,7 +133,7 @@
#{deptId}
</foreach>
</select>
<select id="selectRoleByMenuId" resultType="cn.odboy.model.system.domain.Role">
<select id="queryRoleListByMenuId" resultType="cn.odboy.model.system.domain.Role">
SELECT role.role_id as id
FROM sys_role role,
sys_roles_menus rm