|
|
|
@ -36,8 +36,7 @@ import com.ruoyi.system.service.ISysUserService;
|
|
|
|
|
* @author ruoyi
|
|
|
|
|
*/
|
|
|
|
|
@Service
|
|
|
|
|
public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
{
|
|
|
|
|
public class SysUserServiceImpl implements ISysUserService {
|
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
@ -64,6 +63,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
@Autowired
|
|
|
|
|
SysTrainingScoreMapper trainingScoreMapper;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
SysRoleDeptMapper roleDeptMapper;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据条件分页查询用户列表
|
|
|
|
|
*
|
|
|
|
@ -72,8 +74,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
|
public List<SysUser> selectUserList(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public List<SysUser> selectUserList(SysUser user) {
|
|
|
|
|
return userMapper.selectUserList(user);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -85,8 +86,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
|
public List<SysUser> selectAllocatedList(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public List<SysUser> selectAllocatedList(SysUser user) {
|
|
|
|
|
return userMapper.selectAllocatedList(user);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -98,8 +98,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@DataScope(deptAlias = "d", userAlias = "u")
|
|
|
|
|
public List<SysUser> selectUnallocatedList(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public List<SysUser> selectUnallocatedList(SysUser user) {
|
|
|
|
|
return userMapper.selectUnallocatedList(user);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -110,8 +109,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 用户对象信息
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public SysUser selectUserByUserName(String userName)
|
|
|
|
|
{
|
|
|
|
|
public SysUser selectUserByUserName(String userName) {
|
|
|
|
|
return userMapper.selectUserByUserName(userName);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -122,8 +120,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 用户对象信息
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public SysUser selectUserById(Long userId)
|
|
|
|
|
{
|
|
|
|
|
public SysUser selectUserById(Long userId) {
|
|
|
|
|
return userMapper.selectUserById(userId);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -134,11 +131,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String selectUserRoleGroup(String userName)
|
|
|
|
|
{
|
|
|
|
|
public String selectUserRoleGroup(String userName) {
|
|
|
|
|
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
|
|
|
|
|
if (CollectionUtils.isEmpty(list))
|
|
|
|
|
{
|
|
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
|
}
|
|
|
|
|
return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
|
|
|
|
@ -151,11 +146,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String selectUserPostGroup(String userName)
|
|
|
|
|
{
|
|
|
|
|
public String selectUserPostGroup(String userName) {
|
|
|
|
|
List<SysPost> list = postMapper.selectPostsByUserName(userName);
|
|
|
|
|
if (CollectionUtils.isEmpty(list))
|
|
|
|
|
{
|
|
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
|
|
return StringUtils.EMPTY;
|
|
|
|
|
}
|
|
|
|
|
return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
|
|
|
|
@ -168,11 +161,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkUserNameUnique(String userName)
|
|
|
|
|
{
|
|
|
|
|
public String checkUserNameUnique(String userName) {
|
|
|
|
|
int count = userMapper.checkUserNameUnique(userName);
|
|
|
|
|
if (count > 0)
|
|
|
|
|
{
|
|
|
|
|
if (count > 0) {
|
|
|
|
|
return UserConstants.NOT_UNIQUE;
|
|
|
|
|
}
|
|
|
|
|
return UserConstants.UNIQUE;
|
|
|
|
@ -185,12 +176,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkPhoneUnique(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public String checkPhoneUnique(SysUser user) {
|
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
|
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.UNIQUE;
|
|
|
|
@ -203,12 +192,10 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String checkEmailUnique(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public String checkEmailUnique(SysUser user) {
|
|
|
|
|
Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
|
|
|
|
|
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.UNIQUE;
|
|
|
|
@ -220,10 +207,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @param user 用户信息
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public void checkUserAllowed(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
|
|
|
|
|
{
|
|
|
|
|
public void checkUserAllowed(SysUser user) {
|
|
|
|
|
if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
|
|
|
|
|
throw new ServiceException("不允许操作超级管理员用户");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -234,15 +219,12 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @param userId 用户id
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public void checkUserDataScope(Long userId)
|
|
|
|
|
{
|
|
|
|
|
if (!SysUser.isAdmin(SecurityUtils.getUserId()))
|
|
|
|
|
{
|
|
|
|
|
public void checkUserDataScope(Long userId) {
|
|
|
|
|
if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
|
|
|
|
|
SysUser user = new SysUser();
|
|
|
|
|
user.setUserId(userId);
|
|
|
|
|
List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
|
|
|
|
|
if (StringUtils.isEmpty(users))
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isEmpty(users)) {
|
|
|
|
|
throw new ServiceException("没有权限访问用户数据!");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -256,20 +238,18 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public int insertUser(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public int insertUser(SysUser user) {
|
|
|
|
|
// 新增用户信息
|
|
|
|
|
int rows = userMapper.insertUser(user);
|
|
|
|
|
SysDept dept = user.getDept();
|
|
|
|
|
String deptName = dept.getDeptName();
|
|
|
|
|
String deptName = roleDeptMapper.selectNameById(user.getDeptId());
|
|
|
|
|
user.setStuClass(deptName);
|
|
|
|
|
// 新增用户岗位关联
|
|
|
|
|
insertUserPost(user);
|
|
|
|
|
// 新增用户与角色管理
|
|
|
|
|
insertUserRole(user);
|
|
|
|
|
//新增实训成绩
|
|
|
|
|
Long userId=userMapper.selectUserIDByStuNum(user.getStudentNumber());
|
|
|
|
|
SysTrainingScore sysTrainingScore=new SysTrainingScore();
|
|
|
|
|
Long userId = userMapper.selectUserIDByStuNum(user.getStudentNumber());
|
|
|
|
|
SysTrainingScore sysTrainingScore = new SysTrainingScore();
|
|
|
|
|
sysTrainingScore.setUserid(user.getUserId());
|
|
|
|
|
sysTrainingScore.setStatus(0);
|
|
|
|
|
sysTrainingScore.setId(String.valueOf(UUID.randomUUID()));
|
|
|
|
@ -284,8 +264,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public boolean registerUser(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public boolean registerUser(SysUser user) {
|
|
|
|
|
return userMapper.insertUser(user) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -297,8 +276,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public int updateUser(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public int updateUser(SysUser user) {
|
|
|
|
|
Long userId = user.getUserId();
|
|
|
|
|
// 删除用户与角色关联
|
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
@ -319,8 +297,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public void insertUserAuth(Long userId, Long[] roleIds)
|
|
|
|
|
{
|
|
|
|
|
public void insertUserAuth(Long userId, Long[] roleIds) {
|
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
|
insertUserRole(userId, roleIds);
|
|
|
|
|
}
|
|
|
|
@ -332,8 +309,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int updateUserStatus(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public int updateUserStatus(SysUser user) {
|
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -344,8 +320,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int updateUserProfile(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public int updateUserProfile(SysUser user) {
|
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -357,8 +332,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public boolean updateUserAvatar(String userName, String avatar)
|
|
|
|
|
{
|
|
|
|
|
public boolean updateUserAvatar(String userName, String avatar) {
|
|
|
|
|
return userMapper.updateUserAvatar(userName, avatar) > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -369,8 +343,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int resetPwd(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public int resetPwd(SysUser user) {
|
|
|
|
|
return userMapper.updateUser(user);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -382,8 +355,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public int resetUserPwd(String userName, String password)
|
|
|
|
|
{
|
|
|
|
|
public int resetUserPwd(String userName, String password) {
|
|
|
|
|
return userMapper.resetUserPwd(userName, password);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -392,8 +364,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*
|
|
|
|
|
* @param user 用户对象
|
|
|
|
|
*/
|
|
|
|
|
public void insertUserRole(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public void insertUserRole(SysUser user) {
|
|
|
|
|
this.insertUserRole(user.getUserId(), user.getRoleIds());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -402,15 +373,12 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*
|
|
|
|
|
* @param user 用户对象
|
|
|
|
|
*/
|
|
|
|
|
public void insertUserPost(SysUser user)
|
|
|
|
|
{
|
|
|
|
|
public void insertUserPost(SysUser user) {
|
|
|
|
|
Long[] posts = user.getPostIds();
|
|
|
|
|
if (StringUtils.isNotEmpty(posts))
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isNotEmpty(posts)) {
|
|
|
|
|
// 新增用户与岗位管理
|
|
|
|
|
List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
|
|
|
|
|
for (Long postId : posts)
|
|
|
|
|
{
|
|
|
|
|
for (Long postId : posts) {
|
|
|
|
|
SysUserPost up = new SysUserPost();
|
|
|
|
|
up.setUserId(user.getUserId());
|
|
|
|
|
up.setPostId(postId);
|
|
|
|
@ -426,14 +394,11 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @param userId 用户ID
|
|
|
|
|
* @param roleIds 角色组
|
|
|
|
|
*/
|
|
|
|
|
public void insertUserRole(Long userId, Long[] roleIds)
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isNotEmpty(roleIds))
|
|
|
|
|
{
|
|
|
|
|
public void insertUserRole(Long userId, Long[] roleIds) {
|
|
|
|
|
if (StringUtils.isNotEmpty(roleIds)) {
|
|
|
|
|
// 新增用户与角色管理
|
|
|
|
|
List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
|
|
|
|
|
for (Long roleId : roleIds)
|
|
|
|
|
{
|
|
|
|
|
for (Long roleId : roleIds) {
|
|
|
|
|
SysUserRole ur = new SysUserRole();
|
|
|
|
|
ur.setUserId(userId);
|
|
|
|
|
ur.setRoleId(roleId);
|
|
|
|
@ -451,8 +416,7 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public int deleteUserById(Long userId)
|
|
|
|
|
{
|
|
|
|
|
public int deleteUserById(Long userId) {
|
|
|
|
|
// 删除用户与角色关联
|
|
|
|
|
userRoleMapper.deleteUserRoleByUserId(userId);
|
|
|
|
|
// 删除用户与岗位表
|
|
|
|
@ -468,10 +432,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional
|
|
|
|
|
public int deleteUserByIds(Long[] userIds)
|
|
|
|
|
{
|
|
|
|
|
for (Long userId : userIds)
|
|
|
|
|
{
|
|
|
|
|
public int deleteUserByIds(Long[] userIds) {
|
|
|
|
|
for (Long userId : userIds) {
|
|
|
|
|
checkUserAllowed(new SysUser(userId));
|
|
|
|
|
checkUserDataScope(userId);
|
|
|
|
|
}
|
|
|
|
@ -491,10 +453,8 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
* @return 结果
|
|
|
|
|
*/
|
|
|
|
|
@Override
|
|
|
|
|
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isNull(userList) || userList.size() == 0)
|
|
|
|
|
{
|
|
|
|
|
public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
|
|
|
|
|
if (StringUtils.isNull(userList) || userList.size() == 0) {
|
|
|
|
|
throw new ServiceException("导入用户数据不能为空!");
|
|
|
|
|
}
|
|
|
|
|
int successNum = 0;
|
|
|
|
@ -502,50 +462,38 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
|
|
StringBuilder successMsg = new StringBuilder();
|
|
|
|
|
StringBuilder failureMsg = new StringBuilder();
|
|
|
|
|
String password = configService.selectConfigByKey("sys.user.initPassword");
|
|
|
|
|
for (SysUser user : userList)
|
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
for (SysUser user : userList) {
|
|
|
|
|
try {
|
|
|
|
|
// 验证是否存在这个用户
|
|
|
|
|
SysUser u = userMapper.selectUserByUserName(user.getUserName());
|
|
|
|
|
if (StringUtils.isNull(u))
|
|
|
|
|
{
|
|
|
|
|
if (StringUtils.isNull(u)) {
|
|
|
|
|
BeanValidators.validateWithException(validator, user);
|
|
|
|
|
user.setPassword(SecurityUtils.encryptPassword(password));
|
|
|
|
|
user.setCreateBy(operName);
|
|
|
|
|
this.insertUser(user);
|
|
|
|
|
successNum++;
|
|
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
|
|
|
|
|
}
|
|
|
|
|
else if (isUpdateSupport)
|
|
|
|
|
{
|
|
|
|
|
} else if (isUpdateSupport) {
|
|
|
|
|
BeanValidators.validateWithException(validator, user);
|
|
|
|
|
user.setUpdateBy(operName);
|
|
|
|
|
this.updateUser(user);
|
|
|
|
|
successNum++;
|
|
|
|
|
successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
} else {
|
|
|
|
|
failureNum++;
|
|
|
|
|
failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
catch (Exception e)
|
|
|
|
|
{
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
failureNum++;
|
|
|
|
|
String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败:";
|
|
|
|
|
failureMsg.append(msg + e.getMessage());
|
|
|
|
|
log.error(msg, e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (failureNum > 0)
|
|
|
|
|
{
|
|
|
|
|
if (failureNum > 0) {
|
|
|
|
|
failureMsg.insert(0, "很抱歉,导入失败!共 " + failureNum + " 条数据格式不正确,错误如下:");
|
|
|
|
|
throw new ServiceException(failureMsg.toString());
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
} else {
|
|
|
|
|
successMsg.insert(0, "恭喜您,数据已全部导入成功!共 " + successNum + " 条,数据如下:");
|
|
|
|
|
}
|
|
|
|
|
return successMsg.toString();
|
|
|
|
|