|
|
|
@@ -7,6 +7,8 @@ import com.ruoyi.common.core.utils.StringUtils; |
|
|
|
import com.ruoyi.common.core.utils.bean.BeanValidators; |
|
|
|
import com.ruoyi.common.datascope.annotation.DataScope; |
|
|
|
import com.ruoyi.common.security.utils.SecurityUtils; |
|
|
|
import com.ruoyi.system.api.RemoteAuthService; |
|
|
|
import com.ruoyi.system.api.constant.Constant; |
|
|
|
import com.ruoyi.system.api.domain.SysRole; |
|
|
|
import com.ruoyi.system.api.domain.SysUser; |
|
|
|
import com.ruoyi.system.domain.SysPost; |
|
|
|
@@ -57,6 +59,9 @@ public class SysUserServiceImpl implements ISysUserService { |
|
|
|
@Autowired |
|
|
|
protected Validator validator; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
protected RemoteAuthService remoteAuthService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据条件分页查询用户列表 |
|
|
|
* |
|
|
|
@@ -247,6 +252,16 @@ public class SysUserServiceImpl implements ISysUserService { |
|
|
|
insertUserPost(user); |
|
|
|
// 新增用户与角色管理 |
|
|
|
insertUserRole(user); |
|
|
|
|
|
|
|
// 新增oauth2用户 |
|
|
|
remoteAuthService.add(user); |
|
|
|
|
|
|
|
// todo 新增gitlink用户 |
|
|
|
|
|
|
|
// todo 新增label studio用户 |
|
|
|
|
|
|
|
// todo 新增火石平台用户 |
|
|
|
|
|
|
|
return rows; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -279,6 +294,16 @@ public class SysUserServiceImpl implements ISysUserService { |
|
|
|
userPostMapper.deleteUserPostByUserId(userId); |
|
|
|
// 新增用户与岗位管理 |
|
|
|
insertUserPost(user); |
|
|
|
|
|
|
|
// 更新oauth2用户 |
|
|
|
remoteAuthService.edit(user); |
|
|
|
|
|
|
|
// todo 更新gitlink用户 |
|
|
|
|
|
|
|
// todo 更新label studio用户 |
|
|
|
|
|
|
|
// todo 更新火石平台用户 |
|
|
|
|
|
|
|
return userMapper.updateUser(user); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -337,6 +362,15 @@ public class SysUserServiceImpl implements ISysUserService { |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public int resetPwd(SysUser user) { |
|
|
|
// 更新oauth2用户 |
|
|
|
remoteAuthService.edit(user); |
|
|
|
|
|
|
|
// todo 更新gitlink用户 |
|
|
|
|
|
|
|
// todo 更新label studio用户 |
|
|
|
|
|
|
|
// todo 更新火石平台用户 |
|
|
|
|
|
|
|
return userMapper.updateUser(user); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -434,6 +468,20 @@ public class SysUserServiceImpl implements ISysUserService { |
|
|
|
userRoleMapper.deleteUserRole(userIds); |
|
|
|
// 删除用户与岗位关联 |
|
|
|
userPostMapper.deleteUserPost(userIds); |
|
|
|
|
|
|
|
for (Long userId : userIds) { |
|
|
|
SysUser user = userMapper.selectUserById(userId); |
|
|
|
user.setDelFlag(Constant.DelFlag); |
|
|
|
// 删除oauth2用户 |
|
|
|
remoteAuthService.edit(user); |
|
|
|
|
|
|
|
// todo 删除gitlink用户 |
|
|
|
|
|
|
|
// todo 删除label studio用户 |
|
|
|
|
|
|
|
// todo 删除火石平台用户 |
|
|
|
} |
|
|
|
|
|
|
|
return userMapper.deleteUserByIds(userIds); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -494,5 +542,4 @@ public class SysUserServiceImpl implements ISysUserService { |
|
|
|
} |
|
|
|
return successMsg.toString(); |
|
|
|
} |
|
|
|
|
|
|
|
} |