|
|
|
@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
import com.cloud.kicc.common.core.constant.SecurityConstants; |
|
|
|
import com.cloud.kicc.common.core.constant.SecurityConstants; |
|
|
|
import com.cloud.kicc.common.core.exception.CheckedException; |
|
|
|
import com.cloud.kicc.common.core.exception.CheckedException; |
|
|
|
import com.cloud.kicc.common.data.entity.CasUser; |
|
|
|
import com.cloud.kicc.common.data.entity.CasUser; |
|
|
|
|
|
|
|
import com.cloud.kicc.common.data.entity.KiccUser; |
|
|
|
import com.cloud.kicc.common.security.util.SecurityUtils; |
|
|
|
import com.cloud.kicc.common.security.util.SecurityUtils; |
|
|
|
import com.cloud.kicc.system.api.entity.Dept; |
|
|
|
import com.cloud.kicc.system.api.entity.Dept; |
|
|
|
import com.cloud.kicc.system.api.entity.Role; |
|
|
|
import com.cloud.kicc.system.api.entity.Role; |
|
|
|
import com.cloud.kicc.system.api.entity.User; |
|
|
|
import com.cloud.kicc.system.api.entity.User; |
|
|
|
import com.cloud.kicc.system.api.entity.UserRole; |
|
|
|
import com.cloud.kicc.system.api.entity.UserRole; |
|
|
|
import com.cloud.kicc.system.api.vo.UserVo; |
|
|
|
|
|
|
|
import com.cloud.kicc.system.mapper.UserMapper; |
|
|
|
import com.cloud.kicc.system.mapper.UserMapper; |
|
|
|
import com.cloud.kicc.system.service.*; |
|
|
|
import com.cloud.kicc.system.service.*; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
@ -35,7 +35,6 @@ import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Set; |
|
|
|
import java.util.Set; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Stream; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
*<p> |
|
|
|
*<p> |
|
|
|
@ -58,20 +57,20 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public int saveUser(UserVo userVo) { |
|
|
|
public int saveUser(KiccUser kiccUser) { |
|
|
|
User user = new User(); |
|
|
|
User user = new User(); |
|
|
|
BeanUtils.copyProperties(userVo, user); |
|
|
|
BeanUtils.copyProperties(kiccUser, user); |
|
|
|
if (StrUtil.isEmptyIfStr(user.getId())) { |
|
|
|
if (StrUtil.isEmptyIfStr(user.getId())) { |
|
|
|
// 新增用户信息
|
|
|
|
// 新增用户信息
|
|
|
|
int rows = baseMapper.insert(user); |
|
|
|
int rows = baseMapper.insert(user); |
|
|
|
// 新增用户与角色管理
|
|
|
|
// 新增用户与角色管理
|
|
|
|
addUserRole(userVo); |
|
|
|
addUserRole(kiccUser); |
|
|
|
return rows; |
|
|
|
return rows; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// 修改遵守先删后新增规则
|
|
|
|
// 修改遵守先删后新增规则
|
|
|
|
userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId())); |
|
|
|
userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId())); |
|
|
|
// 新增用户与角色管理
|
|
|
|
// 新增用户与角色管理
|
|
|
|
addUserRole(userVo); |
|
|
|
addUserRole(kiccUser); |
|
|
|
return baseMapper.updateById(user); |
|
|
|
return baseMapper.updateById(user); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -79,7 +78,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
@SneakyThrows |
|
|
|
@SneakyThrows |
|
|
|
public UserVo getUserAuthority(UserVo user) { |
|
|
|
public KiccUser getUserAuthority(KiccUser user) { |
|
|
|
// 设置角色列表
|
|
|
|
// 设置角色列表
|
|
|
|
List<Role> roleList = roleService.selectMyRolesByUserId(user.getCasUserId()); |
|
|
|
List<Role> roleList = roleService.selectMyRolesByUserId(user.getCasUserId()); |
|
|
|
// 设置角色列表 （ID）
|
|
|
|
// 设置角色列表 （ID）
|
|
|
|
@ -107,11 +106,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public UserVo getCurrentUserInfo() { |
|
|
|
public KiccUser getCurrentUserInfo() { |
|
|
|
UserVo user = getUserById(SecurityUtils.getCasUser().getId()); |
|
|
|
KiccUser user = SecurityUtils.getUser(); |
|
|
|
user.setRoleIds(SecurityUtils.getCasUser().getRoleId().split(",")); |
|
|
|
|
|
|
|
user.setTenantIds(SecurityUtils.getCasUser().getTenantId().split(",")); |
|
|
|
|
|
|
|
user.setPermissions(SecurityUtils.getUser().getExPermissions()); |
|
|
|
|
|
|
|
return user; |
|
|
|
return user; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -138,7 +134,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
* 新增用户角色信息 |
|
|
|
* 新增用户角色信息 |
|
|
|
* @param user 用户对象 |
|
|
|
* @param user 用户对象 |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public void addUserRole(UserVo user) { |
|
|
|
public void addUserRole(KiccUser user) { |
|
|
|
String[] roles = user.getRoleIds(); |
|
|
|
String[] roles = user.getRoleIds(); |
|
|
|
if (roles != null) { |
|
|
|
if (roles != null) { |
|
|
|
// 新增用户与角色管理
|
|
|
|
// 新增用户与角色管理
|
|
|
|
@ -152,12 +148,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public List<UserVo> getCourierUserList() { |
|
|
|
public List<KiccUser> getCourierUserList() { |
|
|
|
return baseMapper.getCourierUserList(); |
|
|
|
return baseMapper.getCourierUserList(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public String importUser(List<UserVo> userList, Boolean isUpdateSupport) { |
|
|
|
public String importUser(List<KiccUser> userList, Boolean isUpdateSupport) { |
|
|
|
if (userList == null || userList.isEmpty()) { |
|
|
|
if (userList == null || userList.isEmpty()) { |
|
|
|
throw new CheckedException("导入用户数据不能为空！"); |
|
|
|
throw new CheckedException("导入用户数据不能为空！"); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -165,10 +161,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
int failureNum = 0; |
|
|
|
int failureNum = 0; |
|
|
|
StringBuilder successMsg = new StringBuilder(); |
|
|
|
StringBuilder successMsg = new StringBuilder(); |
|
|
|
StringBuilder failureMsg = new StringBuilder(); |
|
|
|
StringBuilder failureMsg = new StringBuilder(); |
|
|
|
for (UserVo user : userList) { |
|
|
|
for (KiccUser user : userList) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
// 验证是否存在这个用户
|
|
|
|
// 验证是否存在这个用户
|
|
|
|
UserVo uv = getUserByName(user.getUserName()); |
|
|
|
KiccUser uv = getUserByName(user.getUsername()); |
|
|
|
User u = new User(); |
|
|
|
User u = new User(); |
|
|
|
BeanUtils.copyProperties(uv, u); |
|
|
|
BeanUtils.copyProperties(uv, u); |
|
|
|
if (uv == null) { |
|
|
|
if (uv == null) { |
|
|
|
@ -181,18 +177,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
} |
|
|
|
} |
|
|
|
baseMapper.insert(u); |
|
|
|
baseMapper.insert(u); |
|
|
|
successNum++; |
|
|
|
successNum++; |
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功"); |
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUsername() + " 导入成功"); |
|
|
|
} else if (isUpdateSupport) { |
|
|
|
} else if (isUpdateSupport) { |
|
|
|
this.updateById(u); |
|
|
|
this.updateById(u); |
|
|
|
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()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -206,22 +202,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public IPage<UserVo> selectUserList(IPage<Map<String, Object>> page, Map<String, Object> param) { |
|
|
|
public IPage<KiccUser> selectUserList(IPage<Map<String, Object>> page, Map<String, Object> param) { |
|
|
|
return baseMapper.selectUserList(page, param); |
|
|
|
return baseMapper.selectUserList(page, param); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public UserVo getUserById(String userId) { |
|
|
|
public KiccUser getUserById(String userId) { |
|
|
|
return baseMapper.getUserByParam(MapUtil.<String, Object>builder("casUserId", userId).build()); |
|
|
|
return baseMapper.getUserByParam(MapUtil.<String, Object>builder("casUserId", userId).build()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public UserVo getUserByName(String userName) { |
|
|
|
public KiccUser getUserByName(String userName) { |
|
|
|
return baseMapper.getUserByParam(MapUtil.<String, Object>builder("userName", userName).build()); |
|
|
|
return baseMapper.getUserByParam(MapUtil.<String, Object>builder("userName", userName).build()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public List<UserVo> getUserByPhone(String phone) { |
|
|
|
public List<KiccUser> getUserByPhone(String phone) { |
|
|
|
return baseMapper.getUserByParamList(MapUtil.<String, Object>builder("phone", phone).build()); |
|
|
|
return baseMapper.getUserByParamList(MapUtil.<String, Object>builder("phone", phone).build()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
wangxiang
2 years ago