From e90aa05c43c7803a23bc322f1f37696ef0f77f83 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 23 Feb 2024 10:02:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/system/vo/UserVo.java              | 23 +++++++++++++++++++
 .../base/controller/SelectController.java     |  6 +++++
 .../system/base/mapper/ISelectMapper.java     | 11 +++++++++
 .../system/base/service/ISelectService.java   | 10 ++++++++
 .../base/service/impl/ISelectServiceImpl.java |  8 +++++++
 .../base/service/impl/UserServiceImpl.java    |  5 +++-
 .../resources/mapper/base/SelectMapper.xml    |  8 +++++++
 .../main/resources/mapper/base/UserMapper.xml | 14 +++++++++++
 8 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/UserVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/UserVo.java
index fe21c13..77ce1e0 100644
--- a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/UserVo.java
+++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/vo/UserVo.java
@@ -3,6 +3,8 @@ package com.securitycontrol.entity.system.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author：cwchen
  * @date：2024-02-20-15:49
@@ -36,6 +38,27 @@ public class UserVo {
     @ApiModelProperty(value = "手机号")
     private String phone;
 
+    @ApiModelProperty(value = "登录权限")
+    private String loginType;
+
+    @ApiModelProperty(value = "账号类型")
+    private Integer userType;
+
+    @ApiModelProperty(value = "角色ID")
+    private Integer roleId;
+
+    @ApiModelProperty(value = "角色名称")
+    private String roleName;
+
+    @ApiModelProperty(value = "是否超管")
+    private Integer isAdmin;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "账号状态")
+    private Integer accountStatus;
+
     @ApiModelProperty(value = "状态")
     private int delFlag;
 
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
index 056c91e..83822f2 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/SelectController.java
@@ -29,4 +29,10 @@ public class SelectController extends BaseController {
         return service.getOrgTree();
     }
 
+    @ApiOperation(value = "角色下拉选")
+    @PostMapping("getRoleLists")
+    public AjaxResult getRoleLists(){
+        return service.getRoleLists();
+    }
+
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
index 6d31544..bab3911 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/ISelectMapper.java
@@ -1,5 +1,6 @@
 package com.securitycontrol.system.base.mapper;
 
+import com.securitycontrol.entity.system.vo.SelectVo;
 import com.securitycontrol.entity.system.vo.TreeNode;
 import org.springframework.stereotype.Repository;
 
@@ -16,10 +17,20 @@ public interface ISelectMapper {
 
     /**
      * 组织机构树
+     *
      * @return List<TreeNode>
      * @description 组织机构树
      * @author cwchen
      * @date 2024/2/22 9:51
      */
     List<TreeNode> getOrgTree();
+
+    /**
+     * 角色下拉选
+     * @return List<SelectVo>
+     * @description 角色下拉选
+     * @author cwchen
+     * @date 2024/2/22 13:28
+     */
+    List<SelectVo> getRoleLists();
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
index 658f32a..26b0073 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/ISelectService.java
@@ -12,10 +12,20 @@ public interface ISelectService {
 
     /**
      * 组织机构树
+     *
      * @return AjaxResult
      * @description 组织机构树
      * @author cwchen
      * @date 2024/2/22 9:44
      */
     AjaxResult getOrgTree();
+
+    /**
+     * 角色下拉选
+     * @return AjaxResult
+     * @description 角色下拉选
+     * @author cwchen
+     * @date 2024/2/22 13:27
+     */
+    AjaxResult getRoleLists();
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ISelectServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ISelectServiceImpl.java
index ca70d6f..e649818 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ISelectServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ISelectServiceImpl.java
@@ -2,6 +2,7 @@ package com.securitycontrol.system.base.service.impl;
 
 import com.securitycontrol.common.core.web.domain.AjaxResult;
 import com.securitycontrol.entity.system.TreeBuild;
+import com.securitycontrol.entity.system.vo.SelectVo;
 import com.securitycontrol.entity.system.vo.TreeNode;
 import com.securitycontrol.system.base.mapper.ISelectMapper;
 import com.securitycontrol.system.base.service.ISelectService;
@@ -43,4 +44,11 @@ public class ISelectServiceImpl implements ISelectService {
         }
         return AjaxResult.success(groupList);
     }
+
+    @Override
+    public AjaxResult getRoleLists() {
+        List<SelectVo> list = new ArrayList<>();
+        list = mapper.getRoleLists();
+        return AjaxResult.success(list);
+    }
 }
diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java
index 0c6425e..db38000 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java
+++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/UserServiceImpl.java
@@ -1,7 +1,8 @@
 package com.securitycontrol.system.base.service.impl;
 
-import com.securitycontrol.common.core.exception.ServiceException;
+import com.securitycontrol.common.core.utils.aes.DateTimeHelper;
 import com.securitycontrol.common.core.web.domain.AjaxResult;
+import com.securitycontrol.common.security.utils.SecurityUtils;
 import com.securitycontrol.entity.system.dto.UserDto;
 import com.securitycontrol.entity.system.vo.UserVo;
 import com.securitycontrol.system.base.mapper.IUserMapper;
@@ -43,6 +44,8 @@ public class UserServiceImpl implements IUserService {
                 vo.setType(2);
             } else {
                 vo.setType(1);
+                vo.setPassword(SecurityUtils.encryptPassword(vo.getPassword()));
+                vo.setCreateTime(DateTimeHelper.getNowTime());
             }
             mapper.addOrUpdateUser(vo);
         } catch (Exception e) {
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
index 9a823f0..1181afb 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/SelectMapper.xml
@@ -10,4 +10,12 @@
         FROM sys_dict
         WHERE del_flag = '0'
     </select>
+    <!--角色下拉选-->
+    <select id="getRoleLists" resultType="com.securitycontrol.entity.system.vo.SelectVo">
+        SELECT role_id AS id,
+               role_name AS name
+        FROM sys_role
+        WHERE del_flag = 0
+        ORDER BY role_sort
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
index 1dc6df0..9207ccb 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/UserMapper.xml
@@ -12,6 +12,13 @@
                 <if test="orgId != null and orgId!=''">org_id,</if>
                 <if test="deptName != null and deptName != ''">dept_name,</if>
                 <if test="orgName != null and orgName != ''">org_name,</if>
+                <if test="createTime != null and createTime != ''">create_time,</if>
+                <if test="phone != null and phone != ''">phone,</if>
+                <if test="loginType != null and loginType != ''">login_type,</if>
+                <if test="userType != null and userType != ''">user_type,</if>
+                <if test="isAdmin != null and isAdmin != ''">is_admin,</if>
+                <if test="roleId != null and roleId != ''">role_id,</if>
+                <if test="accountStatus != null and accountStatus != ''">status,</if>
             </trim>
             <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="userName != null and userName != ''">#{userName},</if>
@@ -20,6 +27,13 @@
                 <if test="orgId != null and orgId!=''">#{orgId},</if>
                 <if test="deptName != null and deptName != ''">#{deptName},</if>
                 <if test="orgName != null and orgName != ''">#{orgName},</if>
+                <if test="createTime != null and createTime != ''">#{createTime},</if>
+                <if test="phone != null and phone != ''">#{phone},</if>
+                <if test="loginType != null and loginType != ''">#{loginType},</if>
+                <if test="userType != null and userType != ''">#{userType},</if>
+                <if test="isAdmin != null and isAdmin != ''">#{isAdmin},</if>
+                <if test="roleId != null and roleId != ''">#{roleId},</if>
+                <if test="accountStatus != null and accountStatus != ''">#{accountStatus},</if>
             </trim>
         </if>
         <if test="type == 2">