refactor: 重构用户相关代码

- 新增字典编码枚举 DictCodeEnum
-移除 GenderEnum 枚举- 更新 NoticePublishStatusEnum 枚举
- 修改 UserConverter 接口
- 重构 UserImportListener 类
- 更新 UserPageVO 数据结构

src/main/java/com/youlai/boot/system/converter/UserConverter.java

@@ -23,9 +23,6 @@ import org.mapstruct.Mappings;
 @Mapper(componentModel = "spring")
 public interface UserConverter {
 
-    @Mappings({
-            @Mapping(target = "genderLabel", expression = "java(com.youlai.boot.common.base.IBaseEnum.getLabelByValue(bo.getGender(), com.youlai.boot.system.enums.GenderEnum.class))")
-    })
     UserPageVO toPageVo(UserBO bo);
 
     Page<UserPageVO> toPageVo(Page<UserBO> bo);

src/main/java/com/youlai/boot/system/enums/DictCodeEnum.java

@@ -0,0 +1,28 @@
+package com.youlai.boot.system.enums;
+
+import com.youlai.boot.common.base.IBaseEnum;
+import lombok.Getter;
+
+/**
+ * 字典编码枚举
+ *
+ * @author Ray
+ * @since 2024/10/30
+ */
+@Getter
+public enum DictCodeEnum implements IBaseEnum<String> {
+
+    GENDER("gender", "性别"),
+    NOTICE_TYPE("notice_type", "通知类型"),
+    NOTICE_LEVEL("notice_level", "通知级别");
+
+    private final String value;
+
+    private final String label;
+
+    DictCodeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+}

src/main/java/com/youlai/boot/system/enums/GenderEnum.java

@@ -1,28 +0,0 @@
-package com.youlai.boot.system.enums;
-
-import com.youlai.boot.common.base.IBaseEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-
-/**
- * 性别枚举
- *
- * @author haoxr
- * @since 2022/10/14
- */
-@Getter
-@Schema(enumAsRef = true)
-public enum GenderEnum implements IBaseEnum<Integer> {
-
-    MALE(1, "男"),
-    FEMALE (2, "女");
-
-    private final Integer value;
-
-    private final String label;
-
-    GenderEnum(Integer value, String label) {
-        this.value = value;
-        this.label = label;
-    }
-}

src/main/java/com/youlai/boot/system/enums/NoticePublishStatusEnum.java

@@ -8,7 +8,7 @@ import lombok.Getter;
  * 通告发布状态枚举
  *
  * @author haoxr
- * @since 2022/10/14
+ * @since 2024/10/14
  */
 @Getter
 @Schema(enumAsRef = true)

src/main/java/com/youlai/boot/system/listener/UserImportListener.java

@@ -8,20 +8,14 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.youlai.boot.common.base.BaseAnalysisEventListener;
-import com.youlai.boot.system.enums.GenderEnum;
+import com.youlai.boot.system.enums.DictCodeEnum;
-import com.youlai.boot.system.model.entity.Dept;
+import com.youlai.boot.system.model.entity.*;
-import com.youlai.boot.system.model.entity.Role;
-import com.youlai.boot.system.model.entity.User;
-import com.youlai.boot.system.model.entity.UserRole;
 import com.youlai.boot.common.base.IBaseEnum;
 import com.youlai.boot.common.constant.SystemConstants;
 import com.youlai.boot.common.enums.StatusEnum;
 import com.youlai.boot.system.converter.UserConverter;
 import com.youlai.boot.system.model.dto.UserImportDTO;
-import com.youlai.boot.system.service.DeptService;
+import com.youlai.boot.system.service.*;
-import com.youlai.boot.system.service.RoleService;
-import com.youlai.boot.system.service.UserRoleService;
-import com.youlai.boot.system.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
@@ -55,6 +49,7 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
     private final RoleService roleService;
     private final UserRoleService userRoleService;
     private final DeptService deptService;
+    private final DictDataService dictDataService;
 
     public UserImportListener() {
         this.userService = SpringUtil.getBean(UserService.class);
@@ -62,6 +57,7 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
         this.roleService = SpringUtil.getBean(RoleService.class);
         this.userRoleService = SpringUtil.getBean(UserRoleService.class);
         this.deptService = SpringUtil.getBean(DeptService.class);
+        this.dictDataService = SpringUtil.getBean(DictDataService.class);
         this.userConverter = SpringUtil.getBean(UserConverter.class);
     }
 
@@ -107,11 +103,18 @@ public class UserImportListener extends BaseAnalysisEventListener<UserImportDTO>
             // 校验通过，持久化至数据库
             User entity = userConverter.toEntity(userImportDTO);
             entity.setPassword(passwordEncoder.encode(SystemConstants.DEFAULT_PASSWORD));   // 默认密码
-            // 性别逆向解析
+            // 性别逆向翻译 根据字典标签得到字典值
             String genderLabel = userImportDTO.getGenderLabel();
             if (StrUtil.isNotBlank(genderLabel)) {
-                Integer genderValue = (Integer) IBaseEnum.getValueByLabel(genderLabel, GenderEnum.class);
+                DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
-                entity.setGender(genderValue);
+                        .eq(DictData::getDictCode, DictCodeEnum.GENDER.getValue())
+                        .eq(DictData::getLabel, genderLabel)
+                        .last("limit 1")
+                );
+                if (dictData != null) {
+                    Integer genderValue = Integer.parseInt(dictData.getValue());
+                    entity.setGender(genderValue);
+                }
             }
             // 角色解析
             String roleCodes = userImportDTO.getRoleCodes();

src/main/java/com/youlai/boot/system/model/vo/UserPageVO.java

@@ -29,7 +29,7 @@ public class UserPageVO {
     private String mobile;
 
     @Schema(description="性别")
-    private String genderLabel;
+    private Integer gender;
 
     @Schema(description="用户头像地址")
     private String avatar;