From 18c54a74fc6ff0650ff53eeadc094d7e1df0b0a5 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 3 Apr 2023 21:31:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E4=BA=8B=E5=8A=A1?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/RoleDeptService.java | 18 +++++++++--------- .../system/service/RoleMenuService.java | 16 ++++++++-------- .../system/service/UserRoleService.java | 18 +++++++++--------- .../service/impl/RoleDeptServiceImpl.java | 12 ++++++++---- .../service/impl/RoleMenuServiceImpl.java | 13 ++++++++----- .../service/impl/UserRoleServiceImpl.java | 11 +++++++---- .../system/service/impl/UserServiceImpl.java | 3 +++ .../system/UserCenterController.java | 3 ++- 8 files changed, 54 insertions(+), 40 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java index 97350a55..057ac41c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleDeptService.java @@ -38,13 +38,12 @@ public interface RoleDeptService { boolean save(List deptIds, Long roleId); /** - * 根据角色 ID 查询 + * 根据角色 ID 删除 * - * @param roleId - * 角色 ID - * @return 部门 ID 列表 + * @param roleIds + * 角色 ID 列表 */ - List listDeptIdByRoleId(Long roleId); + void deleteByRoleIds(List roleIds); /** * 根据部门 ID 删除 @@ -55,10 +54,11 @@ public interface RoleDeptService { void deleteByDeptIds(List deptIds); /** - * 根据角色 ID 删除 + * 根据角色 ID 查询 * - * @param roleIds - * 角色 ID 列表 + * @param roleId + * 角色 ID + * @return 部门 ID 列表 */ - void deleteByRoleIds(List roleIds); + List listDeptIdByRoleId(Long roleId); } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java index 58d8a3a3..ca77b374 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/RoleMenuService.java @@ -37,6 +37,14 @@ public interface RoleMenuService { */ boolean save(List menuIds, Long roleId); + /** + * 根据角色 ID 删除 + * + * @param roleIds + * 角色 ID 列表 + */ + void deleteByRoleIds(List roleIds); + /** * 根据角色 ID 查询 * @@ -45,12 +53,4 @@ public interface RoleMenuService { * @return 菜单 ID 列表 */ List listMenuIdByRoleIds(List roleIds); - - /** - * 根据角色 ID 删除 - * - * @param roleIds - * 角色 ID 列表 - */ - void deleteByRoleIds(List roleIds); } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java index 4b9319b9..38931239 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/UserRoleService.java @@ -38,13 +38,12 @@ public interface UserRoleService { boolean save(List roleIds, Long userId); /** - * 根据角色 ID 列表查询 + * 根据用户 ID 删除 * - * @param roleIds - * 角色 ID 列表 - * @return 总记录数 + * @param userIds + * 用户 ID 列表 */ - Long countByRoleIds(List roleIds); + void deleteByUserIds(List userIds); /** * 根据用户 ID 查询 @@ -56,10 +55,11 @@ public interface UserRoleService { List listRoleIdByUserId(Long userId); /** - * 根据用户 ID 删除 + * 根据角色 ID 列表查询 * - * @param userIds - * 用户 ID 列表 + * @param roleIds + * 角色 ID 列表 + * @return 总记录数 */ - void deleteByUserIds(List userIds); + Long countByRoleIds(List roleIds); } \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java index 0e14592e..ca4ad4c9 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleDeptServiceImpl.java @@ -22,6 +22,7 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import cn.hutool.core.collection.CollUtil; @@ -42,6 +43,7 @@ public class RoleDeptServiceImpl implements RoleDeptService { private final RoleDeptMapper roleDeptMapper; @Override + @Transactional(rollbackFor = Exception.class) public boolean save(List deptIds, Long roleId) { // 检查是否有变更 List oldDeptIdList = roleDeptMapper.lambdaQuery().select(RoleDeptDO::getDeptId) @@ -58,17 +60,19 @@ public class RoleDeptServiceImpl implements RoleDeptService { } @Override - public List listDeptIdByRoleId(Long roleId) { - return roleDeptMapper.selectDeptIdByRoleId(roleId); + @Transactional(rollbackFor = Exception.class) + public void deleteByRoleIds(List roleIds) { + roleDeptMapper.lambdaUpdate().in(RoleDeptDO::getRoleId, roleIds).remove(); } @Override + @Transactional(rollbackFor = Exception.class) public void deleteByDeptIds(List deptIds) { roleDeptMapper.lambdaUpdate().in(RoleDeptDO::getDeptId, deptIds).remove(); } @Override - public void deleteByRoleIds(List roleIds) { - roleDeptMapper.lambdaUpdate().in(RoleDeptDO::getRoleId, roleIds).remove(); + public List listDeptIdByRoleId(Long roleId) { + return roleDeptMapper.selectDeptIdByRoleId(roleId); } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java index 4d6b5e63..6fabaf6c 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleMenuServiceImpl.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import cn.hutool.core.collection.CollUtil; @@ -43,6 +44,7 @@ public class RoleMenuServiceImpl implements RoleMenuService { private final RoleMenuMapper roleMenuMapper; @Override + @Transactional(rollbackFor = Exception.class) public boolean save(List menuIds, Long roleId) { // 检查是否有变更 List oldMenuIdList = roleMenuMapper.lambdaQuery().select(RoleMenuDO::getMenuId) @@ -58,6 +60,12 @@ public class RoleMenuServiceImpl implements RoleMenuService { return roleMenuMapper.insertBatch(roleMenuList); } + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteByRoleIds(List roleIds) { + roleMenuMapper.lambdaUpdate().in(RoleMenuDO::getRoleId, roleIds).remove(); + } + @Override public List listMenuIdByRoleIds(List roleIds) { if (CollUtil.isEmpty(roleIds)) { @@ -65,9 +73,4 @@ public class RoleMenuServiceImpl implements RoleMenuService { } return roleMenuMapper.selectMenuIdByRoleIds(roleIds); } - - @Override - public void deleteByRoleIds(List roleIds) { - roleMenuMapper.lambdaUpdate().in(RoleMenuDO::getRoleId, roleIds).remove(); - } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java index e20e4dff..7e5c6576 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserRoleServiceImpl.java @@ -22,6 +22,7 @@ import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import cn.hutool.core.collection.CollUtil; @@ -42,6 +43,7 @@ public class UserRoleServiceImpl implements UserRoleService { private final UserRoleMapper userRoleMapper; @Override + @Transactional(rollbackFor = Exception.class) public boolean save(List roleIds, Long userId) { // 检查是否有变更 List oldRoleIdList = userRoleMapper.lambdaQuery().select(UserRoleDO::getRoleId) @@ -58,8 +60,9 @@ public class UserRoleServiceImpl implements UserRoleService { } @Override - public Long countByRoleIds(List roleIds) { - return userRoleMapper.lambdaQuery().in(UserRoleDO::getRoleId, roleIds).count(); + @Transactional(rollbackFor = Exception.class) + public void deleteByUserIds(List userIds) { + userRoleMapper.lambdaUpdate().in(UserRoleDO::getUserId, userIds).remove(); } @Override @@ -68,7 +71,7 @@ public class UserRoleServiceImpl implements UserRoleService { } @Override - public void deleteByUserIds(List userIds) { - userRoleMapper.lambdaUpdate().in(UserRoleDO::getUserId, userIds).remove(); + public Long countByRoleIds(List roleIds) { + return userRoleMapper.lambdaQuery().in(UserRoleDO::getRoleId, roleIds).count(); } } diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index 1db77e4c..5dff7b6a 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -186,6 +186,7 @@ public class UserServiceImpl extends BaseServiceImpl SecureUtils.decryptByRsaPrivateKey(updatePasswordRequest.getNewPassword())); ValidationUtils.throwIfBlank(rawNewPassword, "新密码解密失败"); - ValidationUtils.throwIf(!ReUtil.isMatch(RegexConsts.PASSWORD, rawNewPassword), "密码长度 6 到 32 位，同时包含字母和数字"); + ValidationUtils.throwIf(!ReUtil.isMatch(RegexConsts.PASSWORD, rawNewPassword), + "密码长度为 6 到 32 位，可以包含字母、数字、下划线，特殊字符，同时包含字母和数字"); // 修改密码 userService.updatePassword(rawOldPassword, rawNewPassword, LoginHelper.getUserId());