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-04-09 19:35:28 +08:00
parent e7ced6aa98
commit a320edadf1
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cutejava/cutejava-system/src/main/java/cn/odboy/application/system/mapper/UserMapper.java
+9 -9
View File
@@ -14,9 +14,9 @@ import java.util.Set;
@Mapper
public interface UserMapper extends BaseMapper<User> {
Long getUserCountByCriteria(@Param("criteria") QueryUserRequest criteria);
Long getUserCountByArgs(@Param("criteria") QueryUserRequest criteria);
IPage<User> queryUserPage(@Param("criteria") QueryUserRequest criteria, Page<Object> page);
IPage<User> queryUserPageByArgs(@Param("criteria") QueryUserRequest criteria, Page<Object> page);
User getUserByUsername(@Param("username") String username);
@@ -28,17 +28,17 @@ public interface UserMapper extends BaseMapper<User> {
void updateEmailByUsername(@Param("username") String username, @Param("email") String email);
List<User> selectUserByRoleId(@Param("roleId") Long roleId);
List<User> queryUserListByRoleId(@Param("roleId") Long roleId);
List<User> selectUserByRoleDeptId(@Param("deptId") Long deptId);
List<User> queryUserListByDeptId(@Param("deptId") Long deptId);
List<User> selectUserByMenuId(@Param("menuId") Long menuId);
List<User> queryUserListByMenuId(@Param("menuId") Long menuId);
int getCountByJobs(@Param("jobIds") Set<Long> jobIds);
int getCountByJobIds(@Param("jobIds") Set<Long> jobIds);
int getCountByDepts(@Param("deptIds") Set<Long> deptIds);
int getCountByDeptIds(@Param("deptIds") Set<Long> deptIds);
int getCountByRoles(@Param("roleIds") Set<Long> roleIds);
int getCountByRoleIds(@Param("roleIds") Set<Long> roleIds);
void resetPasswordByUserIds(@Param("userIds") Set<Long> userIds, @Param("pwd") String password);
void updatePasswordByUserIds(@Param("pwd") String password, @Param("userIds") Set<Long> userIds);
}
cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/DeptServiceImpl.java
+2 -2
View File
@@ -230,7 +230,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
@Override
public void verifyBindRelationByIds(Set<Dept> deptSet) {
Set<Long> deptIds = deptSet.stream().map(Dept::getId).collect(Collectors.toSet());
if (userMapper.getCountByDepts(deptIds) > 0) {
if (userMapper.getCountByDeptIds(deptIds) > 0) {
throw new BadRequestException("所选部门存在用户关联，请解除后再试！");
}
if (roleMapper.getRoleCountByDeptIds(deptIds) > 0) {
@@ -280,7 +280,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
* @param id /
*/
public void delCaches(Long id) {
List<User> users = userMapper.selectUserByRoleDeptId(id);
List<User> users = userMapper.queryUserListByDeptId(id);
// 删除数据权限
redisHelper.delByKeys(SystemRedisKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
redisHelper.del(SystemRedisKey.DEPT_ID + id);
cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/JobServiceImpl.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
@Override
public void verifyBindRelationByIds(Set<Long> ids) {
if (userMapper.getCountByJobs(ids) > 0) {
if (userMapper.getCountByJobIds(ids) > 0) {
throw new BadRequestException("所选的岗位中存在用户关联，请解除关联再试！");
}
}
cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/MenuServiceImpl.java
+1 -1
View File
@@ -325,7 +325,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
* @param id 菜单ID
*/
public void delCaches(Long id) {
List<User> users = userMapper.selectUserByMenuId(id);
List<User> users = userMapper.queryUserListByMenuId(id);
redisHelper.del(SystemRedisKey.MENU_ID + id);
redisHelper.delByKeys(SystemRedisKey.MENU_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
// 清除 Role 缓存
cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/RoleServiceImpl.java
+3 -3
View File
@@ -119,7 +119,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override
public void updateMenuById(Role role) {
List<User> users = userMapper.selectUserByRoleId(role.getId());
List<User> users = userMapper.queryUserListByRoleId(role.getId());
// 更新菜单
roleMenuMapper.deleteByRoleId(role.getId());
// 判断是否为空
@@ -205,7 +205,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
@Override
public void verifyBindRelationByIds(Set<Long> ids) {
if (userMapper.getCountByRoles(ids) > 0) {
if (userMapper.getCountByRoleIds(ids) > 0) {
throw new BadRequestException("所选角色存在用户关联，请解除关联再试！");
}
}
@@ -221,7 +221,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
* @param id /
*/
public void delCaches(Long id, List<User> users) {
users = CollectionUtil.isEmpty(users) ? userMapper.selectUserByRoleId(id) : users;
users = CollectionUtil.isEmpty(users) ? userMapper.queryUserListByRoleId(id) : users;
if (CollectionUtil.isNotEmpty(users)) {
users.forEach(item -> userCacheService.cleanUserCacheByUsername(item.getUsername()));
Set<Long> userIds = users.stream().map(User::getId).collect(Collectors.toSet());
cutejava/cutejava-system/src/main/java/cn/odboy/application/system/service/impl/UserServiceImpl.java
+4 -4
View File
@@ -55,14 +55,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
@Override
public PageResult<User> queryUserPage(QueryUserRequest criteria, Page<Object> page) {
criteria.setOffset(page.offset());
List<User> users = userMapper.queryUserPage(criteria, PageUtil.getCount(userMapper)).getRecords();
Long total = userMapper.getUserCountByCriteria(criteria);
List<User> users = userMapper.queryUserPageByArgs(criteria, PageUtil.getCount(userMapper)).getRecords();
Long total = userMapper.getUserCountByArgs(criteria);
return PageUtil.toPage(users, total);
}
@Override
public List<User> selectUserByCriteria(QueryUserRequest criteria) {
return userMapper.queryUserPage(criteria, PageUtil.getCount(userMapper)).getRecords();
return userMapper.queryUserPageByArgs(criteria, PageUtil.getCount(userMapper)).getRecords();
}
@Override
@@ -204,7 +204,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
userOnlineService.kickOutByUsername(user.getUsername());
});
// 重置密码
userMapper.resetPasswordByUserIds(ids, password);
userMapper.updatePasswordByUserIds(password, ids);
}
@Override
cutejava/cutejava-system/src/main/resources/mapper/UserMapper.xml
+9 -9
View File
@@ -34,7 +34,7 @@
<result column="role_data_scope" property="dataScope"/>
</collection>
</resultMap>
<select id="getUserCountByCriteria" resultType="java.lang.Long">
<select id="getUserCountByArgs" resultType="java.lang.Long">
select count(*)
from sys_user u
<where>
@@ -62,7 +62,7 @@
</if>
</where>
</select>
<select id="queryUserPage" resultMap="BaseResultMap">
<select id="queryUserPageByArgs" resultMap="BaseResultMap">
select u.*,
j.id as job_id, j.name as job_name,
r.role_id as role_id, r.name as role_name, r.level as role_level, r.data_scope as role_data_scope
@@ -156,7 +156,7 @@
set email = #{email}
where username = #{username}
</update>
<select id="selectUserByRoleId" resultType="cn.odboy.model.system.domain.User">
<select id="queryUserListByRoleId" resultType="cn.odboy.model.system.domain.User">
SELECT u.user_id as id, u.username
FROM sys_user u,
sys_users_roles r
@@ -164,7 +164,7 @@
AND r.role_id = #{roleId}
group by u.user_id
</select>
<select id="selectUserByRoleDeptId" resultType="cn.odboy.model.system.domain.User">
<select id="queryUserListByDeptId" resultType="cn.odboy.model.system.domain.User">
SELECT u.*
FROM sys_user u,
sys_users_roles r,
@@ -174,7 +174,7 @@
AND d.dept_id = #{deptId}
group by u.user_id
</select>
<select id="selectUserByMenuId" resultType="cn.odboy.model.system.domain.User">
<select id="queryUserListByMenuId" resultType="cn.odboy.model.system.domain.User">
SELECT u.user_id as id, u.username
FROM sys_user u,
sys_users_roles ur,
@@ -184,28 +184,28 @@
AND rm.menu_id = #{menuId}
group by u.user_id
</select>
<select id="getCountByJobs" resultType="int">
<select id="getCountByJobIds" resultType="int">
SELECT count(*) FROM sys_user u, sys_users_jobs j
WHERE u.user_id = j.user_id AND j.job_id IN
<foreach collection="jobIds" item="jobId" open="(" separator="," close=")">
#{jobId}
</foreach>
</select>
<select id="getCountByDepts" resultType="int">
<select id="getCountByDeptIds" resultType="int">
SELECT count(*) FROM sys_user u
WHERE u.dept_id IN
<foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</select>
<select id="getCountByRoles" resultType="int">
<select id="getCountByRoleIds" resultType="int">
SELECT count(*) FROM sys_user u, sys_users_roles r
WHERE u.user_id = r.user_id AND r.role_id in
<foreach collection="roleIds" item="roleId" open="(" separator="," close=")">
#{roleId}
</foreach>
</select>
<update id="resetPasswordByUserIds">
<update id="updatePasswordByUserIds">
update sys_user set password = #{password}
where user_id in
<foreach collection="userIds" item="id" open="(" separator="," close=")">