From 1f6850b7d94dff10ac539d95a7d56ec5ce408b64 Mon Sep 17 00:00:00 2001
From: limin <limin@qq.com>
Date: Mon, 6 Jan 2025 19:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/enums/common/UserImportEnums.java  | 60 +++++++++++++++++++
 .../controller/admin/user/UserController.java |  8 ++-
 .../src/main/resources/application-local.yaml |  3 +
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java

diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java
new file mode 100644
index 000000000..5730bf48b
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/common/UserImportEnums.java
@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.system.enums.common;
+
+
+import cn.hutool.core.util.ObjUtil;
+import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+@Getter
+@AllArgsConstructor
+public enum UserImportEnums implements IntArrayValuable {
+
+    STUDENT_0(0, "学生"),
+    STUDENT_1(1, "学员"),
+    SEX_1(1, "男"),
+    SEX_2(2, "女"),
+    TEACHER_0(0, "老师"),
+    TEACHER_1(1, "教师"),
+    ENABLE(0, "开启"),
+    DISABLE(1, "关闭");
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(UserImportEnums::getStatus).toArray();
+
+    /**
+     * 状态值
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+    public static boolean isEnable(Integer status) {
+        return ObjUtil.equal(STUDENT_0.status, status);
+    }
+
+    public static boolean isDisable(Integer status) {
+        return ObjUtil.equal(STUDENT_1.status, status);
+    }
+
+    /**
+     * 根据 name 返回状态值
+     *
+     * @param name 状态名
+     * @return 状态值，如果未找到则返回 null
+     */
+    public static Integer getStatusByName(String name) {
+        for (UserImportEnums status : values()) {
+            if (ObjUtil.equal(status.getName(), name)) {
+                return status.getStatus();
+            }
+        }
+        return null; // 如果未找到对应的 name，返回 null
+    }
+}
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
index 5ac73161a..99be51b8e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
@@ -14,6 +14,7 @@ import cn.iocoder.yudao.module.system.convert.user.UserConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.enums.common.SexEnum;
+import cn.iocoder.yudao.module.system.enums.common.UserImportEnums;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -247,8 +248,13 @@ public class UserController {
         if (!list.isEmpty()) {
             list.stream().forEach(sysStudentUser ->{
                 AdminUserDO user = new AdminUserDO();
-                BeanUtil.copyProperties(sysStudentUser, user);
                 user.setUserType(2);
+                user.setUsername(sysStudentUser.getUsername());
+                user.setNickname(sysStudentUser.getNickname());
+                user.setMobile(sysStudentUser.getMobile());
+                user.setStatusType(UserImportEnums.getStatusByName(sysStudentUser.getStatusType()));
+                user.setSex(UserImportEnums.getStatusByName(sysStudentUser.getSex()));
+                user.setStatus(UserImportEnums.getStatusByName(sysStudentUser.getStatus()));
                 userList.add(user);
             });
         }
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 42860a96f..2a322a337 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -312,3 +312,6 @@ iot:
     keepalive: 60
     # 清除会话(设置为false,断开连接，重连后使用原来的会话 保留订阅的主题，能接收离线期间的消息)
     clearSession: true
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
\ No newline at end of file