style: 部分代码优化

1.格式优化：去除部分多余空行（较少代码段区分尽量不添加空行）、注释（代码尽量自解释） 2.完善部分 Swagger 注解信息 3.修复部分前后端警告
2025-10-31 22:57:17 +08:00 · 2023-09-10 18:01:44 +08:00
parent b874ca0782
commit a3082e72a9
34 changed files with 116 additions and 99 deletions
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/service/impl/LoginServiceImpl.java
@@ -75,15 +75,12 @@ public class LoginServiceImpl implements LoginService {
        CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, user.getStatus(), "此账号已被禁用，如有疑问，请联系管理员");
        DeptDetailVO deptDetailVO = deptService.get(user.getDeptId());
        CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, deptDetailVO.getStatus(), "此账号部门已被禁用，如有疑问，请联系管理员");
-
-        // 登录
+        // 登录并缓存用户信息
        LoginUser loginUser = BeanUtil.copyProperties(user, LoginUser.class);
        loginUser.setPermissions(permissionService.listPermissionByUserId(userId));
        loginUser.setRoleCodes(permissionService.listRoleCodeByUserId(userId));
        loginUser.setRoles(roleService.listByUserId(userId));
        LoginHelper.login(loginUser);
-
-        // 返回令牌
        return StpUtil.getTokenValue();
    }

@@ -93,7 +90,6 @@ public class LoginServiceImpl implements LoginService {
        if (CollUtil.isEmpty(roleCodeSet)) {
            return new ArrayList<>(0);
        }
-
        // 查询菜单列表
        Set<MenuVO> menuSet = new LinkedHashSet<>();
        if (roleCodeSet.contains(SysConsts.ADMIN_ROLE_CODE)) {
@@ -103,7 +99,6 @@ public class LoginServiceImpl implements LoginService {
        }
        List<MenuVO> menuList =
            menuSet.stream().filter(m -> !MenuTypeEnum.BUTTON.equals(m.getType())).collect(Collectors.toList());
-
        // 构建路由树
        TreeField treeField = MenuVO.class.getDeclaredAnnotation(TreeField.class);
        TreeNodeConfig treeNodeConfig = TreeUtils.genTreeNodeConfig(treeField);
@@ -112,7 +107,6 @@ public class LoginServiceImpl implements LoginService {
            tree.setParentId(m.getParentId());
            tree.setName(m.getTitle());
            tree.setWeight(m.getSort());
-
            tree.putExtra("path", m.getPath());
            tree.putExtra("name", m.getName());
            tree.putExtra("component", m.getComponent());
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
@@ -68,7 +68,6 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
        String name = request.getName();
        boolean isExists = this.checkNameExists(name, request.getParentId(), null);
        CheckUtils.throwIf(isExists, "新增失败，[{}] 已存在", name);
-
        request.setAncestors(this.getAncestors(request.getParentId()));
        request.setStatus(DisEnableStatusEnum.DISABLE);
        return super.add(request);
@@ -99,7 +98,6 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
            CheckUtils.throwIf(DisEnableStatusEnum.ENABLE.equals(newStatus)
                && DisEnableStatusEnum.DISABLE.equals(oldParentDept.getStatus()), "启用 [{}] 前，请先启用其所有上级部门", oldName);
        }
-
        // 变更上级部门
        if (ObjectUtil.notEqual(request.getParentId(), oldParentId)) {
            // 更新祖级列表
@@ -121,7 +119,6 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
            isSystemData.orElseGet(DeptDO::new).getName());
        CheckUtils.throwIf(this.countChildren(ids) > 0, "所选部门存在下级部门，不允许删除");
        CheckUtils.throwIf(userService.countByDeptIds(ids) > 0, "所选部门存在用户关联，请解除关联后重试");
-
        // 删除角色和部门关联
        roleDeptService.deleteByDeptIds(ids);
        // 删除部门
--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/MenuServiceImpl.java
@@ -58,7 +58,6 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuVO,
        String title = request.getTitle();
        boolean isExists = this.checkNameExists(title, request.getParentId(), null);
        CheckUtils.throwIf(isExists, "新增失败，[{}] 已存在", title);
-
        request.setStatus(DisEnableStatusEnum.ENABLE);
        return super.add(request);
    }
@@ -70,7 +69,6 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuVO,
        String title = request.getTitle();
        boolean isExists = this.checkNameExists(title, request.getParentId(), id);
        CheckUtils.throwIf(isExists, "修改失败，[{}] 已存在", title);
-
        super.update(request, id);
    }

--- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
@@ -72,7 +72,6 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
        CheckUtils.throwIf(this.checkNameExists(name, null), "新增失败，[{}] 已存在", name);
        String code = request.getCode();
        CheckUtils.throwIf(this.checkCodeExists(code, null), "新增失败，[{}] 已存在", code);
-
        // 新增信息
        request.setStatus(DisEnableStatusEnum.ENABLE);
        Long roleId = super.add(request);
@@ -101,7 +100,6 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
            CheckUtils.throwIfNotEqual(request.getDataScope(), oldDataScope, "[{}] 是系统内置角色，不允许修改角色数据权限",
                oldRole.getName());
        }
-
        // 更新信息
        super.update(request, id);
        // 更新关联信息
@@ -128,7 +126,6 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
        CheckUtils.throwIf(isSystemData::isPresent, "所选角色 [{}] 是系统内置角色，不允许删除",
            isSystemData.orElseGet(RoleDO::new).getName());
        CheckUtils.throwIf(userRoleService.countByRoleIds(ids) > 0, "所选角色存在用户关联，请解除关联后重试");
-
        // 删除角色和菜单关联
        roleMenuService.deleteByRoleIds(ids);
        // 删除角色和部门关联
--- 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
@@ -92,7 +92,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
        CheckUtils.throwIf(StrUtil.isNotBlank(email) && this.checkEmailExists(email, null), "新增失败，[{}] 已存在", email);
        String phone = request.getPhone();
        CheckUtils.throwIf(StrUtil.isNotBlank(phone) && this.checkPhoneExists(phone, null), "新增失败，[{}] 已存在", phone);
-
        // 新增信息
        request.setStatus(DisEnableStatusEnum.ENABLE);
        Long userId = super.add(request);
@@ -125,7 +124,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
                CollUtil.disjunction(request.getRoleIds(), userRoleService.listRoleIdByUserId(id));
            CheckUtils.throwIfNotEmpty(disjunctionRoleIds, "[{}] 是系统内置用户，不允许变更所属角色", oldUser.getNickname());
        }
-
        // 更新信息
        super.update(request, id);
        // 保存用户和角色关联
@@ -141,7 +139,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
        Optional<UserDO> isSystemData = list.stream().filter(u -> DataTypeEnum.SYSTEM.equals(u.getType())).findFirst();
        CheckUtils.throwIf(isSystemData::isPresent, "所选用户 [{}] 是系统内置用户，不允许删除",
            isSystemData.orElseGet(UserDO::new).getNickname());
-
        // 删除用户和角色关联
        userRoleService.deleteByUserIds(ids);
        // 删除用户
@@ -169,18 +166,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
        String[] avatarSupportImgTypes = FileConsts.AVATAR_SUPPORTED_IMG_TYPES;
        CheckUtils.throwIf(!StrUtil.equalsAnyIgnoreCase(avatarImageType, avatarSupportImgTypes), "头像仅支持 {} 格式的图片",
            String.join(StringConsts.CHINESE_COMMA, avatarSupportImgTypes));
-
-        UserDO user = super.getById(id);
        // 上传新头像
+        UserDO user = super.getById(id);
        String avatarPath = localStorageProperties.getPath().getAvatar();
        File newAvatarFile = FileUtils.upload(avatarFile, avatarPath, false);
        CheckUtils.throwIfNull(newAvatarFile, "上传头像失败");
        assert null != newAvatarFile;
-
        // 更新用户头像
        String newAvatar = newAvatarFile.getName();
        baseMapper.lambdaUpdate().set(UserDO::getAvatar, newAvatar).eq(UserDO::getId, id).update();
-
        // 删除原头像
        String oldAvatar = user.getAvatar();
        if (StrUtil.isNotBlank(oldAvatar)) {
@@ -203,7 +197,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
        CheckUtils.throwIfEqual(newPassword, oldPassword, "新密码不能与当前密码相同");
        UserDO user = super.getById(id);
        CheckUtils.throwIfNotEqual(SecureUtils.md5Salt(oldPassword, id.toString()), user.getPassword(), "当前密码错误");
-
        // 更新密码和密码重置时间
        LocalDateTime now = LocalDateTime.now();
        baseMapper.lambdaUpdate().set(UserDO::getPassword, SecureUtils.md5Salt(newPassword, id.toString()))
@@ -218,7 +211,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
        Long count = baseMapper.lambdaQuery().eq(UserDO::getEmail, newEmail).count();
        CheckUtils.throwIf(count > 0, "邮箱已绑定其他账号，请更换其他邮箱");
        CheckUtils.throwIfEqual(newEmail, user.getEmail(), "新邮箱不能与当前邮箱相同");
-
        // 更新邮箱
        baseMapper.lambdaUpdate().set(UserDO::getEmail, newEmail).eq(UserDO::getId, id).update();
    }