平台用户标准化

commons/src/main/java/com/jzg/commons/entity/dto/SysUserAddParam.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.entity.dto;
+
+import com.jzg.commons.entity.vo.SysUserVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "平台用户表新增dto")
+@Data
+public class SysUserAddParam {
+
+    /** 用户名 */
+    @Schema(description = "用户名")
+    @Size(min=1,max=20,message = "用户名长度不能大于20")
+    @NotNull(message = "用户名不能为空")
+    private String username;
+
+    /** 密码 */
+    @Size(min=8,max=20,message = "密码长度不能大于20,不能小于8")
+    @Schema(description = "密码")
+    @NotNull(message = "登录密码不能为空")
+    private String password;
+
+    /** 手机号 */
+    @Schema(description = "手机号")
+    @Size(min=1,max=11,message = "手机号长度不能大于11")
+    @NotNull(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String mobile;
+
+    @NotEmpty(message = "角色列表不能为空")
+    @Schema(description = "角色列表")
+    private List<SysUserVo.SysRoleVo> roleVoList;
+}

commons/src/main/java/com/jzg/commons/entity/dto/SysUserEditParam.java

@@ -0,0 +1,43 @@
+package com.jzg.commons.entity.dto;
+
+import com.jzg.commons.entity.vo.SysUserVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "平台用户表修改dto")
+@Data
+public class SysUserEditParam {
+
+    @NotNull(message = "平台用户id不能为空")
+    @Schema(description = "平台用户id")
+    private String id;
+
+    /** 用户名 */
+    @Schema(description = "用户名")
+    @Size(min=1,max=20,message = "用户名长度不能大于20")
+    @NotNull(message = "用户名不能为空")
+    private String username;
+
+    /** 密码 */
+    @Size(min=8,max=20,message = "密码长度不能大于20,不能小于8")
+    @Schema(description = "密码")
+    @NotNull(message = "登录密码不能为空")
+    private String password;
+
+    /** 手机号 */
+    @Schema(description = "手机号")
+    @Size(min=1,max=11,message = "手机号长度不能大于11")
+    @NotNull(message = "手机号不能为空")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
+    private String mobile;
+
+    @NotEmpty(message = "角色列表不能为空")
+    @Schema(description = "角色列表")
+    private List<SysUserVo.SysRoleVo> roleVoList;
+}

commons/src/main/java/com/jzg/commons/entity/dto/SysUserParam.java

@@ -0,0 +1,18 @@
+package com.jzg.commons.entity.dto;
+
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "平台用户分页查询dto")
+@Data
+public class SysUserParam extends PageRequest {
+
+    /** 用户状态 : 1 正常 0 锁定 */
+    @Schema(description = "用户状态 : 1 正常 0 锁定")
+    private Integer accountStatus;
+
+    /** 用户信息搜索值 */
+    @Schema(description = "用户信息搜索值")
+    private String searchValue;
+}

commons/src/main/java/com/jzg/commons/entity/vo/SysUserVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
@@ -29,27 +30,23 @@ public class SysUserVo extends PageRequest {
 
     /** 用户名 */
     @Schema(description = "用户名")
-    @Size(min=1,max=20,message = "用户名长度不能大于20")
-    @NotNull(message = "用户名不能为空")
     private String username;
 
     /** 密码 */
-    @Size(min=8,max=20,message = "密码长度不能大于20,不能小于8")
     @Schema(description = "密码")
-    @NotNull(message = "登录密码不能为空")
     private String password;
 
     /** 手机号 */
     @Schema(description = "手机号")
-    @Size(min=1,max=11,message = "手机号长度不能大于11")
-    @NotNull(message = "手机号不能为空")
-    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
     private String mobile;
 
-    @NotEmpty(message = "角色列表不能为空")
     @Schema(description = "角色列表")
     private List<SysRoleVo> roleVoList;
 
+    /** 角色名称集合 */
+    @Schema(description = "角色名称集合")
+    private String roleNames;
+
     @Schema(description = "部门id")
     private String deptId;
 

platform/src/main/java/com/jzg/controller/SysUserController.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.annotation.Log;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.SysUserAddParam;
+import com.jzg.commons.entity.dto.SysUserEditParam;
+import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.enums.BusinessType;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.vo.SysUserVo;
@@ -37,14 +40,14 @@ public class SysUserController extends BaseController {
 
     /**
      * 平台用户列表
-     * @param sysUserVo
+     * @param param
      * @return
      */
     @PostMapping("/userList")
     @Operation(summary = "平台用户列表")
-    public HttpResult sysList(@RequestBody SysUserVo sysUserVo){
-        Page page = sysUserVo.getPage();
-        return HttpResult.ok(sysUserService.queryPage(page,sysUserVo));
+    public HttpResult sysList(@RequestBody SysUserParam param){
+        Page page = param.getPage();
+        return HttpResult.ok(sysUserService.queryPage(page,param));
     }
 
     /**
@@ -61,34 +64,33 @@ public class SysUserController extends BaseController {
 
     /**
      * 平台用户添加
-     * @param sysUserVo
+     * @param param
      * @return
      */
     @Log(title = "平台用户管理", businessType = BusinessType.INSERT)
     @Operation(summary = "平台用户添加")
     @PostMapping("/userAdd")
-    public HttpResult userAdd(@Validated @RequestBody SysUserVo sysUserVo) {
+    public HttpResult userAdd(@Validated @RequestBody SysUserAddParam param) {
         // 手机号不允许重复
-        boolean mobileExists = sysUserService.isExistsMobile(sysUserVo.getMobile(), null);
+        boolean mobileExists = sysUserService.isExistsMobile(param.getMobile(), null);
         AssertionUtils.isFail(mobileExists,"手机号重复！");
-        sysUserService.userAdd(sysUserVo);
+        sysUserService.userAdd(param);
         return HttpResult.ok("新增成功");
     }
 
     /**
      * 平台用户修改
-     * @param sysUserVo
+     * @param param
      * @return
      */
     @Log(title = "平台用户管理", businessType = BusinessType.UPDATE)
     @Operation(summary = "平台用户修改")
     @PutMapping("/userEdit")
-    public HttpResult userEdit(@Validated @RequestBody SysUserVo sysUserVo) {
-        AssertionUtils.isFail(StringUtils.isNull(sysUserVo.getId()),"平台用户id不能为空！");
+    public HttpResult userEdit(@Validated @RequestBody SysUserEditParam param) {
         // 手机号不允许重复
-        boolean mobileExists = sysUserService.isExistsMobile(sysUserVo.getMobile(), sysUserVo.getId());
+        boolean mobileExists = sysUserService.isExistsMobile(param.getMobile(), param.getId());
         AssertionUtils.isFail(mobileExists,"手机号重复！");
-        sysUserService.userEdit(sysUserVo);
+        sysUserService.userEdit(param);
         return HttpResult.ok("修改成功");
     }
 

platform/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -2,6 +2,7 @@ package com.jzg.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.vo.SysUserVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -19,10 +20,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     /**
      * 平台用户分页列表查询
      * @param page
-     * @param sysUserVo
+     * @param param
      * @return
      */
-    Page<SysUser> queryPage(Page page, @Param("sysUserVo") SysUserVo sysUserVo);
+    Page<SysUserVo> queryPage(Page page, @Param("param") SysUserParam param);
 }
 
 

platform/src/main/java/com/jzg/service/SysUserService.java

@@ -2,10 +2,12 @@ package com.jzg.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.dto.SysUserAddParam;
+import com.jzg.commons.entity.dto.SysUserEditParam;
+import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.vo.SysUserVo;
 import com.jzg.commons.entity.vo.UpAndDownVo;
-import jakarta.validation.constraints.NotEmpty;
 
 import java.util.List;
 
@@ -18,18 +20,19 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 平台用户分页列表
+     *
      * @param page
-     * @param sysUserVo
+     * @param param
      * @return
      */
-    public Page<SysUser> queryPage(Page page, SysUserVo sysUserVo);
+    public Page<SysUserVo> queryPage(Page page, SysUserParam param);
 
     /**
      * 平台用户信息查询
      * @param id
      * @return
      */
-    public SysUser queryById(String id);
+    public SysUserVo queryById(String id);
 
     /**
      * 平台用户手机号重复校验
@@ -41,15 +44,17 @@ public interface SysUserService extends IService<SysUser> {
 
     /**
      * 平台用户新增
-     * @param sysUserVo
+     *
+     * @param param
      */
-    void userAdd(SysUserVo sysUserVo);
+    void userAdd(SysUserAddParam param);
 
     /**
      * 平台用户修改
-     * @param sysUserVo
+     *
+     * @param param
      */
-    void userEdit(SysUserVo sysUserVo);
+    void userEdit(SysUserEditParam param);
 
     /**
      * 批量删除租户信息

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.dto.SysUserAddParam;
+import com.jzg.commons.entity.dto.SysUserEditParam;
+import com.jzg.commons.entity.dto.SysUserParam;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.SysRole;
-import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.po.SysUser;
 import com.jzg.commons.entity.po.SysUserRole;
 import com.jzg.commons.entity.vo.SysUserVo;
@@ -19,7 +21,6 @@ import com.jzg.mapper.SysUserMapper;
 import com.jzg.mapper.SysUserRoleMapper;
 import com.jzg.service.SysUserService;
 import com.jzg.commons.util.PasswordUtils;
-import jakarta.validation.constraints.NotEmpty;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,9 +46,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     private SysUserRoleMapper sysUserRoleMapper;
 
     @Override
-    public Page<SysUser> queryPage(Page page, SysUserVo sysUserVo) {
-        Page<SysUser> userPage = baseMapper.queryPage(page, sysUserVo);
-        List<SysUser> userList = userPage.getRecords();
+    public Page<SysUserVo> queryPage(Page page, SysUserParam param) {
+        Page<SysUserVo> userPage = baseMapper.queryPage(page, param);
+        List<SysUserVo> userList = userPage.getRecords();
         if (!userList.isEmpty()) {
             List<String> userIdList = userList.stream().map(user -> user.getId()).collect(Collectors.toList());
             // 批量查询 角色信息
@@ -65,10 +66,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     }
 
     @Override
-    public SysUser queryById(String id) {
+    public SysUserVo queryById(String id) {
         SysUser user = this.baseMapper.selectById(id);
-
-        return user;
+        SysUserVo vo = new SysUserVo();
+        BeanUtils.copyProperties(user, vo);
+        return vo;
     }
 
     @Override
@@ -82,17 +84,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void userAdd(SysUserVo sysUserVo) {
+    public void userAdd(SysUserAddParam param) {
         SysUser user = new SysUser();
-        BeanUtils.copyProperties(sysUserVo, user);
+        BeanUtils.copyProperties(param, user);
         user.setAccountStatus(1);
         String salt = PasswordUtils.getSalt();
-        String encryptedPassword = PasswordUtils.encode(sysUserVo.getPassword(),salt);
+        String encryptedPassword = PasswordUtils.encode(param.getPassword(),salt);
         user.setSalt(salt);
         user.setPassword(encryptedPassword);
         this.save(user);
         // 角色信息关联
-        List<SysUserVo.SysRoleVo> roleList = sysUserVo.getRoleVoList();
+        List<SysUserVo.SysRoleVo> roleList = param.getRoleVoList();
         List<SysUserRole> userRoles = new ArrayList<>();
         roleList.forEach(role -> {
             SysUserRole sysUserRole = new SysUserRole();
@@ -105,11 +107,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void userEdit(SysUserVo sysUserVo) {
+    public void userEdit(SysUserEditParam param) {
         SysUser user = new SysUser();
-        BeanUtils.copyProperties(sysUserVo, user);
+        BeanUtils.copyProperties(param, user);
         SysUser sysUser = this.getById(user.getId());
-        String encryptedPassword = PasswordUtils.encode(sysUserVo.getPassword(),sysUser.getSalt());
+        String encryptedPassword = PasswordUtils.encode(param.getPassword(),sysUser.getSalt());
         user.setPassword(encryptedPassword);
         this.updateById(user);
 
@@ -119,7 +121,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         sysUserRoleMapper.delete(updateWrapper);
 
         // 角色信息关联
-        List<SysUserVo.SysRoleVo> roleList = sysUserVo.getRoleVoList();
+        List<SysUserVo.SysRoleVo> roleList = param.getRoleVoList();
         List<SysUserRole> userRoles = new ArrayList<>();
         roleList.forEach(role -> {
             SysUserRole sysUserRole = new SysUserRole();

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -26,14 +26,14 @@
         update_time,is_delete,system_code
         FROM sys_user
     </sql>
-    <select id="queryPage" resultType="com.jzg.commons.entity.po.SysUser">
+    <select id="queryPage" resultType="com.jzg.commons.entity.vo.SysUserVo">
         <include refid="selectUserVo"/>
         <where>
-            <if test="sysUserVo.accountStatus != null and sysUserVo.accountStatus != ''">
-                and account_status = #{sysUserVo.accountStatus}
+            <if test="param.accountStatus != null and param.accountStatus != ''">
+                and account_status = #{param.accountStatus}
             </if>
-            <if test="sysUserVo.searchValue != null and sysUserVo.searchValue != ''">
-                and ( username = #{sysUserVo.searchValue} or mobile = #{sysUserVo.searchValue} or id = #{sysUserVo.searchValue})
+            <if test="param.searchValue != null and param.searchValue != ''">
+                and ( username = #{param.searchValue} or mobile = #{param.searchValue} or id = #{param.searchValue})
             </if>
             and system_code = 'PLATFORM' and is_delete = 0
         </where>