From 760b48bb7c070ef79ad24b596389550dbae90c2e Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Sat, 8 Feb 2025 14:47:27 +0800 Subject: [PATCH] =?UTF-8?q?feat()=EF=BC=9A=E5=A2=9E=E5=8A=A0=E7=9B=B8?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 6 +-- .../common/core/constant/UserConstants.java | 10 ----- .../{SysDelFlag.java => SysDelFlagEnum.java} | 15 +++---- ...Disable.java => SysNormalDisableEnum.java} | 5 ++- .../common/core/enums/SysWhetherEnum.java | 42 +++++++++++++++++++ .../{UserStatus.java => UserStatusEnum.java} | 4 +- .../common/system/domain/SysDictData.java | 3 +- .../system/controller/SysDeptController.java | 5 +-- .../muyu/system/domain/rep/SysDeptAddReq.java | 5 +-- .../muyu/system/domain/rep/SysDeptUpdReq.java | 1 - .../service/impl/SysDeptServiceImpl.java | 16 +++---- 11 files changed, 70 insertions(+), 42 deletions(-) rename cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/{SysDelFlag.java => SysDelFlagEnum.java} (66%) rename cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/{SysNormalDisable.java => SysNormalDisableEnum.java} (87%) create mode 100644 cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysWhetherEnum.java rename cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/{UserStatus.java => UserStatusEnum.java} (83%) diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index ff0af1a..06ebd59 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -5,7 +5,7 @@ import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.enums.UserStatus; +import com.muyu.common.core.enums.UserStatusEnum; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.StringUtils; @@ -78,11 +78,11 @@ public class SysLoginService { LoginUser userInfo = userResult.getData(); SysUser user = userResult.getData().getSysUser(); - if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { + if (UserStatusEnum.DELETED.getCode().equals(user.getDelFlag())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除"); throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); } - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { + if (UserStatusEnum.DISABLE.getCode().equals(user.getStatus())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); throw new ServiceException("对不起，您的账号：" + username + " 已停用"); } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java index 0df401c..976bb0d 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/UserConstants.java @@ -31,16 +31,6 @@ public class UserConstants { */ public static final String ROLE_DISABLE = "1"; - /** - * 部门正常状态 - */ - public static final String DEPT_NORMAL = "0"; - - /** - * 部门停用状态 - */ - public static final String DEPT_DISABLE = "1"; - /** * 字典正常状态 */ diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysDelFlag.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysDelFlagEnum.java similarity index 66% rename from cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysDelFlag.java rename to cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysDelFlagEnum.java index 2c5ff7a..e26bf1c 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysDelFlag.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysDelFlagEnum.java @@ -1,12 +1,16 @@ package com.muyu.common.core.enums; +import lombok.Getter; + /** + * 系统逻辑删除 * @author dongzeliang * @version 1.0 * @description: 系统逻辑删除 * @date 2025/1/16 18:48 */ -public enum SysDelFlag { +@Getter +public enum SysDelFlagEnum { // 存在 EXIST("0", "存在"), // 删除 @@ -15,16 +19,9 @@ public enum SysDelFlag { private final String code; private final String info; - SysDelFlag(String code, String info) { + SysDelFlagEnum(String code, String info) { this.code = code; this.info = info; } - public String getCode() { - return code; - } - - public String getInfo() { - return info; - } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysNormalDisable.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysNormalDisableEnum.java similarity index 87% rename from cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysNormalDisable.java rename to cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysNormalDisableEnum.java index 007cf0f..43fdfe3 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysNormalDisable.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysNormalDisableEnum.java @@ -3,19 +3,20 @@ package com.muyu.common.core.enums; import lombok.Getter; /** + * 系统开关 * @author dongzeliang * @version 1.0 * @description: 系统开关 * @date 2025/1/16 18:44 */ @Getter -public enum SysNormalDisable { +public enum SysNormalDisableEnum { ENABLE("0", "正常"), DISABLE("1", "停用"); private final String code; private final String info; - SysNormalDisable(String code, String info) { + SysNormalDisableEnum(String code, String info) { this.code = code; this.info = info; } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysWhetherEnum.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysWhetherEnum.java new file mode 100644 index 0000000..1bc77bb --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/SysWhetherEnum.java @@ -0,0 +1,42 @@ +package com.muyu.common.core.enums; + +import lombok.Getter; + +/** + * 系统是否 + * @author dongzeliang + * @version 1.0 + * @description: 系统是否 + * @date 2025/1/27 10:43 + */ +@Getter +public enum SysWhetherEnum { + + YES("Y", "是"), + NO("N", "否"); + private final String code; + private final String info; + + SysWhetherEnum(String code, String info) { + this.code = code; + this.info = info; + } + + /** + * 判定为是 + * @param code 编码 + * @return 若为是返回true + */ + public static boolean isYes(String code) { + return YES.getCode().equals(code); + } + + /** + * 判定为否 + * @param code 编码 + * @return 若为否返回true + */ + public static boolean isNo(String code) { + return NO.getCode().equals(code); + } +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/UserStatusEnum.java similarity index 83% rename from cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java rename to cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/UserStatusEnum.java index 32ff39a..12106dd 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/enums/UserStatusEnum.java @@ -5,13 +5,13 @@ package com.muyu.common.core.enums; * * @author muyu */ -public enum UserStatus { +public enum UserStatusEnum { OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); private final String code; private final String info; - UserStatus (String code, String info) { + UserStatusEnum(String code, String info) { this.code = code; this.info = info; } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java index 5beee3f..365ac59 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java @@ -3,6 +3,7 @@ package com.muyu.common.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.constant.UserConstants; +import com.muyu.common.core.enums.SysWhetherEnum; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; @@ -99,6 +100,6 @@ public class SysDictData extends BaseEntity { } public boolean getDefault () { - return UserConstants.YES.equals(this.isDefault); + return SysWhetherEnum.isYes(this.isDefault); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 5fbd9bf..0924930 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -1,13 +1,12 @@ package com.muyu.system.controller; -import com.muyu.common.core.constant.UserConstants; +import com.muyu.common.core.enums.SysNormalDisableEnum; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.system.domain.model.CheckDeptNameUniqueModel; import com.muyu.system.domain.model.SysDeptPageQueryModel; @@ -95,7 +94,7 @@ public class SysDeptController extends BaseController { return error("修改部门'" + sysDeptUpdReq.getDeptName() + "'失败，部门名称已存在"); } else if (sysDeptUpdReq.getParentId().equals(deptId)) { return error("修改部门'" + sysDeptUpdReq.getDeptName() + "'失败，上级部门不能是自己"); - } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, sysDeptUpdReq.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) { + } else if (SysNormalDisableEnum.isDisable(sysDeptUpdReq.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0) { return error("该部门包含未停用的子部门！"); } deptService.updateDept(sysDeptUpdReq.buildSysDept(deptId)); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java index d9bff89..cafdb1d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.rep; -import com.baomidou.mybatisplus.annotation.TableField; -import com.muyu.common.core.enums.SysDelFlag; +import com.muyu.common.core.enums.SysDelFlagEnum; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import lombok.AllArgsConstructor; @@ -62,7 +61,7 @@ public class SysDeptAddReq { .deptName(this.deptName) .orderNum(this.orderNum) .email(this.email) - .delFlag(SysDelFlag.EXIST.getCode()) + .delFlag(SysDelFlagEnum.EXIST.getCode()) .phone(this.phone) .status(this.status) .leader(this.leader) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java index 4656934..cb63663 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java @@ -1,6 +1,5 @@ package com.muyu.system.domain.rep; -import com.muyu.common.core.enums.SysDelFlag; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index 398d6e1..0181f6e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; -import com.muyu.common.core.enums.SysDelFlag; -import com.muyu.common.core.enums.SysNormalDisable; +import com.muyu.common.core.enums.SysDelFlagEnum; +import com.muyu.common.core.enums.SysNormalDisableEnum; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.SpringUtils; @@ -50,7 +50,7 @@ public class SysDeptServiceImpl extends ServiceImpl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotEmpty(sysDeptPageQueryModel.getDeptName()),SysDept::getDeptName, sysDeptPageQueryModel.getDeptName()); queryWrapper.eq(StringUtils.isNotEmpty(sysDeptPageQueryModel.getStatus()),SysDept::getStatus,sysDeptPageQueryModel.getStatus()); - queryWrapper.eq(SysDept::getDelFlag, SysNormalDisable.ENABLE.getCode()); + queryWrapper.eq(SysDept::getDelFlag, SysNormalDisableEnum.ENABLE.getCode()); return this.list(queryWrapper); } @@ -202,7 +202,7 @@ public class SysDeptServiceImpl extends ServiceImpl // 若不传入部门ID则查询内容为所有部门不唯一 queryWrapper.eq(Objects.nonNull(checkDeptNameUniqueModel.getParentDeptId()), SysDept::getParentId, checkDeptNameUniqueModel.getParentDeptId()); //部门的状态必须为正常才可进行判断 - queryWrapper.eq(SysDept::getStatus, SysDelFlag.EXIST.getCode()); + queryWrapper.eq(SysDept::getStatus, SysDelFlagEnum.EXIST.getCode()); // 如果存在传入的部门则校验除了当前部门之外的其他部门 queryWrapper.ne(Objects.nonNull(checkDeptNameUniqueModel.getDeptId()),SysDept::getDeptId, checkDeptNameUniqueModel.getDeptId()); return this.count(queryWrapper) == 0 ? UserConstants.NOT_UNIQUE : UserConstants.UNIQUE; @@ -235,7 +235,7 @@ public class SysDeptServiceImpl extends ServiceImpl public void insertDept (SysDept dept) { SysDept parentSysDept = this.getById(dept.getParentId()); // 如果父节点不为正常状态,则不允许新增子节点 - if (SysNormalDisable.isDisable(dept.getStatus())) { + if (SysNormalDisableEnum.isDisable(dept.getStatus())) { throw new ServiceException("部门停用，不允许新增"); } dept.setAncestors(parentSysDept.getAncestors() + "," + dept.getParentId()); @@ -260,7 +260,7 @@ public class SysDeptServiceImpl extends ServiceImpl updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors); } this.updateById(dept); - if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) + if (SysNormalDisableEnum.isEnable(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors()) && !StringUtils.equals("0", dept.getAncestors())) { // 如果该部门是启用状态，则启用该部门的所有上级部门 updateParentDeptStatusNormal(dept); @@ -276,7 +276,7 @@ public class SysDeptServiceImpl extends ServiceImpl String ancestors = dept.getAncestors(); List deptIdList = Convert.toLongList(ancestors); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(SysDept::getStatus, SysNormalDisable.ENABLE.getCode()); + updateWrapper.set(SysDept::getStatus, SysNormalDisableEnum.ENABLE.getCode()); updateWrapper.in(SysDept::getDeptId, deptIdList); } @@ -307,7 +307,7 @@ public class SysDeptServiceImpl extends ServiceImpl @Override public void deleteDeptById (Long deptId) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(SysDept::getDelFlag, SysDelFlag.NOT_EXIST.getCode()); + updateWrapper.set(SysDept::getDelFlag, SysDelFlagEnum.NOT_EXIST.getCode()); updateWrapper.eq(SysDept::getDeptId, deptId); this.update(updateWrapper); }