odboy/cutejava
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upd: 编码规范

Browse Source
This commit is contained in:
odboy
2025-03-25 22:03:01 +08:00
parent 7bf2e41c58
commit b67273f228
4 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/RoleMapper.java
+8 -10
View File
@@ -12,14 +12,12 @@ import java.util.Set;
@Mapper @Mapper
public interface RoleMapper extends BaseMapper<Role> { public interface RoleMapper extends BaseMapper<Role> {
List<Role> selectByPage(); List<Role> findAllRoles();
Long countByCriteria(@Param("criteria") RoleQueryCriteria criteria); Long countRoles(@Param("criteria") RoleQueryCriteria criteria);
List<Role> selectByPage(@Param("criteria") RoleQueryCriteria criteria); List<Role> findRoles(@Param("criteria") RoleQueryCriteria criteria);
Role selectById(@Param("roleId") Long roleId); Role findRoleById(@Param("roleId") Long roleId);
Role selectByName(@Param("name") String name); Role findRoleByName(@Param("name") String name);
List<Role> selectByUserId(@Param("userId") Long userId); List<Role> findRolesByUserId(@Param("userId") Long userId);
int countByDeptIds(@Param("deptIds") Set<Long> deptIds); int countRolesByDeptIds(@Param("deptIds") Set<Long> 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<Role> findRolesByMenuId(@Param("menuId") Long menuId);
List<Role> selectByMenuId(@Param("menuId") Long menuId);
} }
cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java
+1 -1
View File
@@ -226,7 +226,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
if (userMapper.countByDepts(deptIds) > 0) { if (userMapper.countByDepts(deptIds) > 0) {
throw new BadRequestException("所选部门存在用户关联，请解除后再试！"); throw new BadRequestException("所选部门存在用户关联，请解除后再试！");
} }
if (roleMapper.countByDeptIds(deptIds) > 0) { if (roleMapper.countRolesByDeptIds(deptIds) > 0) {
throw new BadRequestException("所选部门存在角色关联，请解除后再试！"); throw new BadRequestException("所选部门存在角色关联，请解除后再试！");
} }
} }
cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java
+9 -9
View File
@@ -45,19 +45,19 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override @Override
public List<Role> queryAll() { public List<Role> queryAll() {
return roleMapper.selectByPage(); return roleMapper.findAllRoles();
} }
@Override @Override
public List<Role> queryAll(RoleQueryCriteria criteria) { public List<Role> queryAll(RoleQueryCriteria criteria) {
return roleMapper.selectByPage(criteria); return roleMapper.findRoles(criteria);
} }
@Override @Override
public PageResult<Role> queryAll(RoleQueryCriteria criteria, Page<Object> page) { public PageResult<Role> queryAll(RoleQueryCriteria criteria, Page<Object> page) {
criteria.setOffset(page.offset()); criteria.setOffset(page.offset());
List<Role> roles = roleMapper.selectByPage(criteria); List<Role> roles = roleMapper.findRoles(criteria);
Long total = roleMapper.countByCriteria(criteria); Long total = roleMapper.countRoles(criteria);
return PageUtil.toPage(roles, total); return PageUtil.toPage(roles, total);
} }
@@ -75,7 +75,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void create(Role resources) { 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()); throw new EntityExistException(Role.class, "username", resources.getName());
} }
save(resources); save(resources);
@@ -89,7 +89,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void update(Role resources) { public void update(Role resources) {
Role role = getById(resources.getId()); 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())) { if (role1 != null && !role1.getId().equals(role.getId())) {
throw new EntityExistException(Role.class, "username", resources.getName()); throw new EntityExistException(Role.class, "username", resources.getName());
} }
@@ -141,7 +141,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
String key = CacheKey.ROLE_USER + userId; String key = CacheKey.ROLE_USER + userId;
List<Role> roles = redisUtil.getList(key, Role.class); List<Role> roles = redisUtil.getList(key, Role.class);
if (CollUtil.isEmpty(roles)) { if (CollUtil.isEmpty(roles)) {
roles = roleMapper.selectByUserId(userId); roles = roleMapper.findRolesByUserId(userId);
redisUtil.set(key, roles, 1, TimeUnit.DAYS); redisUtil.set(key, roles, 1, TimeUnit.DAYS);
} }
return roles; return roles;
@@ -171,7 +171,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
return permissions.stream().map(AuthorityDto::new) return permissions.stream().map(AuthorityDto::new)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
List<Role> roles = roleMapper.selectByUserId(user.getId()); List<Role> roles = roleMapper.findRolesByUserId(user.getId());
permissions = roles.stream().flatMap(role -> role.getMenus().stream()) permissions = roles.stream().flatMap(role -> role.getMenus().stream())
.map(Menu::getPermission) .map(Menu::getPermission)
.filter(StringUtil::isNotBlank).collect(Collectors.toSet()); .filter(StringUtil::isNotBlank).collect(Collectors.toSet());
@@ -205,7 +205,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override @Override
public List<Role> findByMenuId(Long menuId) { public List<Role> findByMenuId(Long menuId) {
return roleMapper.selectByMenuId(menuId); return roleMapper.findRolesByMenuId(menuId);
} }
/** /**
cutejava/cutejava-system/src/main/resources/mapper/RoleMapper.xml
+10 -15
View File
@@ -21,14 +21,11 @@
<result column="dept_name" property="name"/> <result column="dept_name" property="name"/>
</collection> </collection>
</resultMap> </resultMap>
<select id="findAllRoles" resultType="cn.odboy.model.system.domain.Role">
<select id="queryAll" resultType="cn.odboy.model.system.domain.Role">
select role_id as id, name, level select role_id as id, name, level
from sys_role order by level from sys_role order by level
</select> </select>
<select id="findRoles" resultMap="BaseResultMap">
<select id="findAll" resultMap="BaseResultMap">
select role.*, select role.*,
dept.dept_id as dept_id, dept.name as dept_name, 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 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 left join sys_dept dept on dept.dept_id = srd.dept_id
order by role.role_level order by role.role_level
</select> </select>
<select id="countRoles" resultType="java.lang.Long">
<select id="countAll" resultType="java.lang.Long">
select count(*) select count(*)
from sys_role role from sys_role role
<where> <where>
@@ -76,13 +72,11 @@
</if> </if>
</where> </where>
</select> </select>
<select id="findRoleByName" resultType="cn.odboy.model.system.domain.Role">
<select id="findByName" resultType="cn.odboy.model.system.domain.Role">
select role_id as id from sys_role select role_id as id from sys_role
where name = #{name} where name = #{name}
</select> </select>
<select id="findRoleById" resultMap="BaseResultMap">
<select id="findById" resultMap="BaseResultMap">
select select
role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope, 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, 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 left join sys_dept dept on dept.dept_id = srd.dept_id
where role.role_id = #{roleId} where role.role_id = #{roleId}
</select> </select>
<select id="findRolesByUserId" resultMap="BaseResultMap">
<select id="findByUserId" resultMap="BaseResultMap">
SELECT SELECT
role.role_id as role_role_id, role.name as role_name, role.data_scope as role_data_scope, 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, 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 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} WHERE role.role_id = ur.role_id AND ur.user_id = #{userId}
</select> </select>
<select id="countRolesByDeptIds" resultType="int">
<select id="countByDepts" resultType="int">
select count(*) select count(*)
from sys_role r, sys_roles_depts d from sys_role r, sys_roles_depts d
where r.role_id = d.role_id where r.role_id = d.role_id
@@ -122,4 +114,7 @@
#{deptId} #{deptId}
</foreach> </foreach>
</select> </select>
<select id="findRolesByMenuId" resultType="cn.odboy.model.system.domain.Role">
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}
</select>
</mapper> </mapper>