feat()：增加相对应数据字典枚举类型

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 + " 已停用");
         }

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";
-
     /**
      * 字典正常状态
      */

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;
-    }
 }

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;
     }

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);
+    }
+}

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;
     }

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);
     }
 }

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));

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.SysDelFlagEnum;
-import com.muyu.common.core.enums.SysDelFlag;
 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)

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;

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.SysDelFlagEnum;
-import com.muyu.common.core.enums.SysNormalDisable;
+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<SysDeptMapper, SysDept>
         LambdaQueryWrapper<SysDept> 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<SysDeptMapper, SysDept>
         // 若不传入部门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<SysDeptMapper, SysDept>
     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<SysDeptMapper, SysDept>
             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<SysDeptMapper, SysDept>
         String ancestors = dept.getAncestors();
         List<Long> deptIdList = Convert.toLongList(ancestors);
         LambdaUpdateWrapper<SysDept> 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<SysDeptMapper, SysDept>
     @Override
     public void deleteDeptById (Long deptId) {
         LambdaUpdateWrapper<SysDept> 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);
     }