|
|
|
@ -4,6 +4,7 @@ import java.util.ArrayList;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import javax.validation.Validator;
|
|
|
|
import javax.validation.Validator;
|
|
|
|
|
|
|
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
@ -32,12 +33,11 @@ import com.ruoyi.system.service.ISysUserService;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 用户 业务层处理
|
|
|
|
* 用户 业务层处理
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @author ruoyi
|
|
|
|
* @author ruoyi
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
|
public class SysUserServiceImpl implements ISysUserService
|
|
|
|
public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
{
|
|
|
|
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
@ -63,79 +63,72 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 根据条件分页查询用户列表
|
|
|
|
* 根据条件分页查询用户列表
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 用户信息集合信息
|
|
|
|
* @return 用户信息集合信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u",tenantAlias = "u")
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u", tenantAlias = "u")
|
|
|
|
public List<SysUser> selectUserList(SysUser user)
|
|
|
|
public List<SysUser> selectUserList(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.selectUserList(user);
|
|
|
|
return userMapper.selectUserList(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 根据条件分页查询已分配用户角色列表
|
|
|
|
* 根据条件分页查询已分配用户角色列表
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 用户信息集合信息
|
|
|
|
* @return 用户信息集合信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
public List<SysUser> selectAllocatedList(SysUser user)
|
|
|
|
public List<SysUser> selectAllocatedList(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.selectAllocatedList(user);
|
|
|
|
return userMapper.selectAllocatedList(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 根据条件分页查询未分配用户角色列表
|
|
|
|
* 根据条件分页查询未分配用户角色列表
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 用户信息集合信息
|
|
|
|
* @return 用户信息集合信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
public List<SysUser> selectUnallocatedList(SysUser user)
|
|
|
|
public List<SysUser> selectUnallocatedList(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.selectUnallocatedList(user);
|
|
|
|
return userMapper.selectUnallocatedList(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 通过用户名查询用户
|
|
|
|
* 通过用户名查询用户
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param userName 用户名
|
|
|
|
* @return 用户对象信息
|
|
|
|
* @return 用户对象信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public SysUser selectUserByUserName(String userName)
|
|
|
|
public SysUser selectUserByUserName(String userName) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.selectUserByUserName(userName);
|
|
|
|
return userMapper.selectUserByUserName(userName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 通过用户ID查询用户
|
|
|
|
* 通过用户ID查询用户
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @return 用户对象信息
|
|
|
|
* @return 用户对象信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public SysUser selectUserById(Long userId)
|
|
|
|
public SysUser selectUserById(Long userId) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.selectUserById(userId);
|
|
|
|
return userMapper.selectUserById(userId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询用户所属角色组
|
|
|
|
* 查询用户所属角色组
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param userName 用户名
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public String selectUserRoleGroup(String userName)
|
|
|
|
public String selectUserRoleGroup(String userName) {
|
|
|
|
{
|
|
|
|
|
|
|
|
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
|
|
|
|
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
|
|
|
|
if (CollectionUtils.isEmpty(list))
|
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
|
|
|
|
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
|
|
|
|
@ -143,16 +136,14 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 查询用户所属岗位组
|
|
|
|
* 查询用户所属岗位组
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param userName 用户名
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public String selectUserPostGroup(String userName)
|
|
|
|
public String selectUserPostGroup(String userName) {
|
|
|
|
{
|
|
|
|
|
|
|
|
List<SysPost> list = postMapper.selectPostsByUserName(userName);
|
|
|
|
List<SysPost> list = postMapper.selectPostsByUserName(userName);
|
|
|
|
if (CollectionUtils.isEmpty(list))
|
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
|
|
|
|
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
|
|
|
|
@ -160,17 +151,15 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 校验用户名称是否唯一
|
|
|
|
* 校验用户名称是否唯一
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean checkUserNameUnique(SysUser user)
|
|
|
|
public boolean checkUserNameUnique(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
|
|
|
|
SysUser info = userMapper.checkUserNameUnique(user.getUserName());
|
|
|
|
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
|
|
|
|
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
@ -183,12 +172,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean checkPhoneUnique(SysUser user)
|
|
|
|
public boolean checkPhoneUnique(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
|
|
|
|
SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
|
|
|
|
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
|
|
|
|
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
@ -201,12 +188,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean checkEmailUnique(SysUser user)
|
|
|
|
public boolean checkEmailUnique(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
SysUser info = userMapper.checkEmailUnique(user.getEmail());
|
|
|
|
SysUser info = userMapper.checkEmailUnique(user.getEmail());
|
|
|
|
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
|
|
|
|
if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
@ -214,33 +199,28 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 校验用户是否允许操作
|
|
|
|
* 校验用户是否允许操作
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void checkUserAllowed(SysUser user)
|
|
|
|
public void checkUserAllowed(SysUser user) {
|
|
|
|
{
|
|
|
|
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
|
|
|
|
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
throw new ServiceException("不允许操作超级管理员用户");
|
|
|
|
throw new ServiceException("不允许操作超级管理员用户");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 校验用户是否有数据权限
|
|
|
|
* 校验用户是否有数据权限
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userId 用户id
|
|
|
|
* @param userId 用户id
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void checkUserDataScope(Long userId)
|
|
|
|
public void checkUserDataScope(Long userId) {
|
|
|
|
{
|
|
|
|
if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
|
|
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
SysUser user = new SysUser();
|
|
|
|
SysUser user = new SysUser();
|
|
|
|
user.setUserId(userId);
|
|
|
|
user.setUserId(userId);
|
|
|
|
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
|
|
|
|
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
|
|
|
|
if (StringUtils.isEmpty(users))
|
|
|
|
if (StringUtils.isEmpty(users)) {
|
|
|
|
{
|
|
|
|
|
|
|
|
throw new ServiceException("没有权限访问用户数据！");
|
|
|
|
throw new ServiceException("没有权限访问用户数据！");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -248,14 +228,13 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增保存用户信息
|
|
|
|
* 新增保存用户信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public int insertUser(SysUser user)
|
|
|
|
public int insertUser(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
// 新增用户信息
|
|
|
|
// 新增用户信息
|
|
|
|
int rows = userMapper.insertUser(user);
|
|
|
|
int rows = userMapper.insertUser(user);
|
|
|
|
// 新增用户岗位关联
|
|
|
|
// 新增用户岗位关联
|
|
|
|
@ -267,26 +246,24 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 注册用户信息
|
|
|
|
* 注册用户信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean registerUser(SysUser user)
|
|
|
|
public boolean registerUser(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.insertUser(user) > 0;
|
|
|
|
return userMapper.insertUser(user) > 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 修改保存用户信息
|
|
|
|
* 修改保存用户信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public int updateUser(SysUser user)
|
|
|
|
public int updateUser(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
Long userId = user.getUserId();
|
|
|
|
Long userId = user.getUserId();
|
|
|
|
// 删除用户与角色关联
|
|
|
|
// 删除用户与角色关联
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
@ -301,104 +278,94 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 用户授权角色
|
|
|
|
* 用户授权角色
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @param roleIds 角色组
|
|
|
|
* @param roleIds 角色组
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void insertUserAuth(Long userId, Long[] roleIds)
|
|
|
|
public void insertUserAuth(Long userId, Long[] roleIds) {
|
|
|
|
{
|
|
|
|
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
insertUserRole(userId, roleIds);
|
|
|
|
insertUserRole(userId, roleIds);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 修改用户状态
|
|
|
|
* 修改用户状态
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int updateUserStatus(SysUser user)
|
|
|
|
public int updateUserStatus(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 修改用户基本信息
|
|
|
|
* 修改用户基本信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int updateUserProfile(SysUser user)
|
|
|
|
public int updateUserProfile(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 修改用户头像
|
|
|
|
* 修改用户头像
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param avatar 头像地址
|
|
|
|
* @param avatar 头像地址
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean updateUserAvatar(String userName, String avatar)
|
|
|
|
public boolean updateUserAvatar(String userName, String avatar) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.updateUserAvatar(userName, avatar) > 0;
|
|
|
|
return userMapper.updateUserAvatar(userName, avatar) > 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 重置用户密码
|
|
|
|
* 重置用户密码
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户信息
|
|
|
|
* @param user 用户信息
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int resetPwd(SysUser user)
|
|
|
|
public int resetPwd(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 重置用户密码
|
|
|
|
* 重置用户密码
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param userName 用户名
|
|
|
|
* @param password 密码
|
|
|
|
* @param password 密码
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public int resetUserPwd(String userName, String password)
|
|
|
|
public int resetUserPwd(String userName, String password) {
|
|
|
|
{
|
|
|
|
|
|
|
|
return userMapper.resetUserPwd(userName, password);
|
|
|
|
return userMapper.resetUserPwd(userName, password);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增用户角色信息
|
|
|
|
* 新增用户角色信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户对象
|
|
|
|
* @param user 用户对象
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void insertUserRole(SysUser user)
|
|
|
|
public void insertUserRole(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
this.insertUserRole(user.getUserId(), user.getRoleIds());
|
|
|
|
this.insertUserRole(user.getUserId(), user.getRoleIds());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增用户岗位信息
|
|
|
|
* 新增用户岗位信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param user 用户对象
|
|
|
|
* @param user 用户对象
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void insertUserPost(SysUser user)
|
|
|
|
public void insertUserPost(SysUser user) {
|
|
|
|
{
|
|
|
|
|
|
|
|
Long[] posts = user.getPostIds();
|
|
|
|
Long[] posts = user.getPostIds();
|
|
|
|
if (StringUtils.isNotEmpty(posts))
|
|
|
|
if (StringUtils.isNotEmpty(posts)) {
|
|
|
|
{
|
|
|
|
|
|
|
|
// 新增用户与岗位管理
|
|
|
|
// 新增用户与岗位管理
|
|
|
|
List<SysUserPost> list = new ArrayList<SysUserPost>();
|
|
|
|
List<SysUserPost> list = new ArrayList<SysUserPost>();
|
|
|
|
for (Long postId : posts)
|
|
|
|
for (Long postId : posts) {
|
|
|
|
{
|
|
|
|
|
|
|
|
SysUserPost up = new SysUserPost();
|
|
|
|
SysUserPost up = new SysUserPost();
|
|
|
|
up.setUserId(user.getUserId());
|
|
|
|
up.setUserId(user.getUserId());
|
|
|
|
up.setPostId(postId);
|
|
|
|
up.setPostId(postId);
|
|
|
|
@ -410,18 +377,15 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 新增用户角色信息
|
|
|
|
* 新增用户角色信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @param roleIds 角色组
|
|
|
|
* @param roleIds 角色组
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void insertUserRole(Long userId, Long[] roleIds)
|
|
|
|
public void insertUserRole(Long userId, Long[] roleIds) {
|
|
|
|
{
|
|
|
|
if (StringUtils.isNotEmpty(roleIds)) {
|
|
|
|
if (StringUtils.isNotEmpty(roleIds))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// 新增用户与角色管理
|
|
|
|
// 新增用户与角色管理
|
|
|
|
List<SysUserRole> list = new ArrayList<SysUserRole>();
|
|
|
|
List<SysUserRole> list = new ArrayList<SysUserRole>();
|
|
|
|
for (Long roleId : roleIds)
|
|
|
|
for (Long roleId : roleIds) {
|
|
|
|
{
|
|
|
|
|
|
|
|
SysUserRole ur = new SysUserRole();
|
|
|
|
SysUserRole ur = new SysUserRole();
|
|
|
|
ur.setUserId(userId);
|
|
|
|
ur.setUserId(userId);
|
|
|
|
ur.setRoleId(roleId);
|
|
|
|
ur.setRoleId(roleId);
|
|
|
|
@ -433,14 +397,13 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 通过用户ID删除用户
|
|
|
|
* 通过用户ID删除用户
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @param userId 用户ID
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public int deleteUserById(Long userId)
|
|
|
|
public int deleteUserById(Long userId) {
|
|
|
|
{
|
|
|
|
|
|
|
|
// 删除用户与角色关联
|
|
|
|
// 删除用户与角色关联
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
// 删除用户与岗位表
|
|
|
|
// 删除用户与岗位表
|
|
|
|
@ -450,16 +413,14 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 批量删除用户信息
|
|
|
|
* 批量删除用户信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userIds 需要删除的用户ID
|
|
|
|
* @param userIds 需要删除的用户ID
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public int deleteUserByIds(Long[] userIds)
|
|
|
|
public int deleteUserByIds(Long[] userIds) {
|
|
|
|
{
|
|
|
|
for (Long userId : userIds) {
|
|
|
|
for (Long userId : userIds)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
checkUserAllowed(new SysUser(userId));
|
|
|
|
checkUserAllowed(new SysUser(userId));
|
|
|
|
checkUserDataScope(userId);
|
|
|
|
checkUserDataScope(userId);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -472,17 +433,15 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 导入用户数据
|
|
|
|
* 导入用户数据
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param userList 用户数据列表
|
|
|
|
* @param userList 用户数据列表
|
|
|
|
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
|
|
|
|
* @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
|
|
|
|
* @param operName 操作用户
|
|
|
|
* @param operName 操作用户
|
|
|
|
* @return 结果
|
|
|
|
* @return 结果
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
|
|
|
|
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
|
|
|
|
{
|
|
|
|
if (StringUtils.isNull(userList) || userList.size() == 0) {
|
|
|
|
if (StringUtils.isNull(userList) || userList.size() == 0)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
throw new ServiceException("导入用户数据不能为空！");
|
|
|
|
throw new ServiceException("导入用户数据不能为空！");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int successNum = 0;
|
|
|
|
int successNum = 0;
|
|
|
|
@ -490,23 +449,18 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
StringBuilder successMsg = new StringBuilder();
|
|
|
|
StringBuilder successMsg = new StringBuilder();
|
|
|
|
StringBuilder failureMsg = new StringBuilder();
|
|
|
|
StringBuilder failureMsg = new StringBuilder();
|
|
|
|
String password = configService.selectConfigByKey("sys.user.initPassword");
|
|
|
|
String password = configService.selectConfigByKey("sys.user.initPassword");
|
|
|
|
for (SysUser user : userList)
|
|
|
|
for (SysUser user : userList) {
|
|
|
|
{
|
|
|
|
try {
|
|
|
|
try
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
// 验证是否存在这个用户
|
|
|
|
// 验证是否存在这个用户
|
|
|
|
SysUser u = userMapper.selectUserByUserName(user.getUserName());
|
|
|
|
SysUser u = userMapper.selectUserByUserName(user.getUserName());
|
|
|
|
if (StringUtils.isNull(u))
|
|
|
|
if (StringUtils.isNull(u)) {
|
|
|
|
{
|
|
|
|
|
|
|
|
BeanValidators.validateWithException(validator, user);
|
|
|
|
BeanValidators.validateWithException(validator, user);
|
|
|
|
user.setPassword(SecurityUtils.encryptPassword(password));
|
|
|
|
user.setPassword(SecurityUtils.encryptPassword(password));
|
|
|
|
user.setCreateBy(operName);
|
|
|
|
user.setCreateBy(operName);
|
|
|
|
userMapper.insertUser(user);
|
|
|
|
userMapper.insertUser(user);
|
|
|
|
successNum++;
|
|
|
|
successNum++;
|
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
|
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
|
|
|
|
}
|
|
|
|
} else if (isUpdateSupport) {
|
|
|
|
else if (isUpdateSupport)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
BeanValidators.validateWithException(validator, user);
|
|
|
|
BeanValidators.validateWithException(validator, user);
|
|
|
|
checkUserAllowed(u);
|
|
|
|
checkUserAllowed(u);
|
|
|
|
checkUserDataScope(u.getUserId());
|
|
|
|
checkUserDataScope(u.getUserId());
|
|
|
|
@ -515,31 +469,43 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
userMapper.updateUser(user);
|
|
|
|
userMapper.updateUser(user);
|
|
|
|
successNum++;
|
|
|
|
successNum++;
|
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
|
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
failureNum++;
|
|
|
|
failureNum++;
|
|
|
|
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
|
|
|
|
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch (Exception e) {
|
|
|
|
catch (Exception e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
failureNum++;
|
|
|
|
failureNum++;
|
|
|
|
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
|
|
|
|
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
|
|
|
|
failureMsg.append(msg + e.getMessage());
|
|
|
|
failureMsg.append(msg + e.getMessage());
|
|
|
|
log.error(msg, e);
|
|
|
|
log.error(msg, e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (failureNum > 0)
|
|
|
|
if (failureNum > 0) {
|
|
|
|
{
|
|
|
|
|
|
|
|
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
|
|
|
|
failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
|
|
|
|
throw new ServiceException(failureMsg.toString());
|
|
|
|
throw new ServiceException(failureMsg.toString());
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
|
|
|
|
successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return successMsg.toString();
|
|
|
|
return successMsg.toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* @param: tenantId
|
|
|
|
|
|
|
|
* @description 根据租户ID获取用户ID数组
|
|
|
|
|
|
|
|
* @author xins
|
|
|
|
|
|
|
|
* @date 2023-09-27 10:08
|
|
|
|
|
|
|
|
* @return Long[]
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public Long[] getUserIdsByTenantId(Long tenantId) {
|
|
|
|
|
|
|
|
SysUser queryUser = new SysUser();
|
|
|
|
|
|
|
|
queryUser.setTenantId(tenantId);
|
|
|
|
|
|
|
|
List<SysUser> users = userMapper.selectUserList(queryUser);
|
|
|
|
|
|
|
|
if (users != null && !users.isEmpty()) {
|
|
|
|
|
|
|
|
return users.stream().
|
|
|
|
|
|
|
|
map(SysUser::getUserId).toArray(Long[]::new);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return new Long[0];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
夜笙歌
2 years ago