新增用户列表接口

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -13,6 +13,7 @@ import com.usky.system.service.ISysDeptService;
 import com.usky.system.service.ISysPostService;
 import com.usky.system.service.ISysRoleService;
 import com.usky.system.service.ISysUserService;
+import com.usky.system.service.vo.SysUserVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -62,11 +63,10 @@ public class SysUserController extends BaseController
      */
 //    @Log(title = "用户管理", businessType = BusinessType.OTHER)
     @GetMapping("/dUserList")
-    public ApiResult<TableDataInfo> DUserList(SysUser user)
+    public ApiResult<List<SysUserVO>> dUserList(SysUser user)
     {
-        startPage();
-        List<SysUser> list = userService.selectDUserList(user);
-        return ApiResult.success(getDataTable(list));
+        List<SysUserVO> list = userService.dUserList(user);
+        return ApiResult.success(list);
     }
 
     /**

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysUserService.java

@@ -4,6 +4,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.system.domain.SysUser;
 import com.usky.system.model.LoginUser;
+import com.usky.system.service.vo.SysUserVO;
 
 import java.util.List;
 
@@ -29,6 +30,14 @@ public interface ISysUserService extends CrudService<SysUser> {
      */
     public List<SysUser> selectDUserList(SysUser user);
 
+    /**
+     * 查询用户列表 - new
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    List<SysUserVO> dUserList(SysUser user);
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysUserServiceImpl.java

@@ -2,7 +2,6 @@ package com.usky.system.service.impl;
 
 
 import com.ruoyi.common.datascope.annotation.DataScope;
-import com.usky.common.core.constants.Constants;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
@@ -15,17 +14,16 @@ import com.usky.system.mapper.*;
 import com.usky.system.model.LoginUser;
 import com.usky.system.service.ISysConfigService;
 import com.usky.system.service.ISysUserService;
+import com.usky.system.service.vo.UserPostVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -87,6 +85,37 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
         return userMapper.selectUserList(user);
     }
 
+    /**
+     * 用户列表-新
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<com.usky.system.service.vo.SysUserVO> dUserList(SysUser user) {
+        user.setTenantId(SecurityUtils.getTenantId());
+        user.setUserType("00");
+        List<com.usky.system.service.vo.SysUserVO> sysUserVOS = new ArrayList<>();
+        List<SysUser> sysUsers = userMapper.selectUserList(user);
+        List<Long> userIds = new ArrayList<>();
+        if (!sysUsers.isEmpty()) {
+            for (SysUser sysUser : sysUsers) {
+                com.usky.system.service.vo.SysUserVO sysUserVO = new com.usky.system.service.vo.SysUserVO();
+                try {
+                    BeanUtils.copyProperties(sysUser, sysUserVO);
+                } catch (BeansException e) {
+                    throw new BusinessException("dUserList方法，获取用户列表信息异常" + e);
+                }
+                userIds.add(sysUser.getUserId());
+                sysUserVOS.add(sysUserVO);
+            }
+            Map<Long, String> userIdToPostMap = userPostMapper.getUserPost(userIds).stream()
+                    .collect(Collectors.toMap(UserPostVo::getUserId, UserPostVo::getPostName));
+            sysUserVOS.forEach(sysUserVO -> sysUserVO.setPost(userIdToPostMap.get(sysUserVO.getUserId())));
+        }
+        return sysUserVOS;
+    }
+
     /**
      * 根据条件分页查询已分配用户角色列表
      *
@@ -219,7 +248,7 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
     }
 
     @Override
-    public String checkPhoneUnique1(String phone, Integer tenantId){
+    public String checkPhoneUnique1(String phone, Integer tenantId) {
         int count = userMapper.checkPhoneUnique1(phone, tenantId);
         if (count > 0) {
             return UserConstants.NOT_UNIQUE;
@@ -478,16 +507,16 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
 
     @Override
     @Transactional
-    public int deleteUserByPwd(Long userId,String password) {
+    public int deleteUserByPwd(Long userId, String password) {
         checkUserAllowed(new SysUser(userId));
         SysUser user = this.selectUserById(userId);
-        if (user.getPassword().equals(password)){
+        if (user.getPassword().equals(password)) {
             // 删除用户与角色关联
             userRoleMapper.deleteUserRoleByUserId(userId);
             // 删除用户与岗位表
             userPostMapper.deleteUserPostByUserId(userId);
             return userMapper.deleteUserById(userId);
-        }else {
+        } else {
             throw new BusinessException("密码错误");
         }
     }
@@ -531,26 +560,26 @@ public class SysUserServiceImpl extends AbstractCrudService<SysUserMapper, SysUs
 
     @Override
     public SysUser getAppUserInfo(String username, Integer tenantId, String phone) {
-       SysUser sysUser = new SysUser();
-       if (!StringUtils.isBlank(username)) {
-           sysUser = userMapper.selectUserData(username, tenantId);
-       } else if (!StringUtils.isBlank(phone)) {
-           sysUser = userMapper.selectUserDataOne(tenantId,phone);
-       }
-       if(Objects.isNull(sysUser)){
-           sysUser = userMapper.selectUserDataOne(tenantId,username);
-           if (Objects.isNull(sysUser)){
-               throw new BusinessException("用户信息未注册");
-           }
-       }
-       List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
-       List<SysRoleVO> collect = sysRoles.stream().map(sysRole -> {
-           SysRoleVO sysRoleVO = new SysRoleVO();
-           BeanUtils.copyProperties(sysRole, sysRoleVO);
-           return sysRoleVO;
-       }).collect(Collectors.toList());
-       sysUser.setRoles(collect);
-       return sysUser;
+        SysUser sysUser = new SysUser();
+        if (!StringUtils.isBlank(username)) {
+            sysUser = userMapper.selectUserData(username, tenantId);
+        } else if (!StringUtils.isBlank(phone)) {
+            sysUser = userMapper.selectUserDataOne(tenantId, phone);
+        }
+        if (Objects.isNull(sysUser)) {
+            sysUser = userMapper.selectUserDataOne(tenantId, username);
+            if (Objects.isNull(sysUser)) {
+                throw new BusinessException("用户信息未注册");
+            }
+        }
+        List<SysRole> sysRoles = roleMapper.selectRolePermissionByUserId(sysUser.getUserId());
+        List<SysRoleVO> collect = sysRoles.stream().map(sysRole -> {
+            SysRoleVO sysRoleVO = new SysRoleVO();
+            BeanUtils.copyProperties(sysRole, sysRoleVO);
+            return sysRoleVO;
+        }).collect(Collectors.toList());
+        sysUser.setRoles(collect);
+        return sysUser;
     }
 
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SysUserVO.java

@@ -0,0 +1,43 @@
+package com.usky.system.service.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ *
+ * @author fu
+ * @date 2024/8/23
+ */
+@Data
+public class SysUserVO {
+    /** 用户ID */
+    private Long userId;
+
+    /** 部门ID */
+    private Long deptId;
+
+    /** 用户账号 */
+    private String userName;
+
+    /** 用户昵称 */
+    private String nickName;
+
+    /** 用户邮箱 */
+    private String email;
+
+    /** 手机号码 */
+    private String phonenumber;
+
+    /** 用户性别 */
+    private String sex;
+
+    /** 用户头像 */
+    private String avatar;
+
+    /** 地址 */
+    private String address;
+
+    /** 岗位 */
+    @TableField(exist = false)
+    private String post;
+}