#update
This commit is contained in:
@@ -166,6 +166,8 @@ public class SysLoginController {
|
||||
ajax.put("nickName", nickName);
|
||||
if (sysUser != null) {
|
||||
ajax.put("roleId",sysUser.getRoleId());
|
||||
ajax.put("siteId",sysUser.getSiteId());
|
||||
ajax.put("orgId",sysUser.getOrgId());
|
||||
aiChatNum = sysUser.getAiChatNum();
|
||||
sysUser.setSessionId(split[1]);
|
||||
sysUser.setDisplayPassword(password);
|
||||
|
||||
@@ -16,6 +16,7 @@ import com.maibu.service.ISysDeptService;
|
||||
import com.maibu.service.ISysRoleService;
|
||||
import com.maibu.service.ISysUserService;
|
||||
import com.maibu.utils.MessageUtils;
|
||||
import com.maibu.utils.SecurityUtils;
|
||||
import com.maibu.utils.StringUtils;
|
||||
import com.maibu.utils.collection.CollectionUtils;
|
||||
import com.maibu.utils.poi.ExcelUtil;
|
||||
@@ -187,6 +188,17 @@ public class SysRoleController extends BaseController {
|
||||
return success(roleService.selectRoleAll());
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取角色选择框列表
|
||||
*/
|
||||
@ApiOperation("获取角色选择框列表")
|
||||
@GetMapping("/selectAllocatableRole")
|
||||
public AjaxResult selectAllocatableRole() {
|
||||
Long roleId = SecurityUtils.getLoginUser() == null? null:SecurityUtils.getLoginUser().getRoleId();
|
||||
return success(roleService.selectAllocatableRole(roleId));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询已分配用户角色列表
|
||||
*/
|
||||
|
||||
@@ -37,8 +37,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
@Api(tags = "用户管理")
|
||||
@RestController
|
||||
@RequestMapping("/system/user")
|
||||
public class SysUserController extends BaseController
|
||||
{
|
||||
public class SysUserController extends BaseController {
|
||||
@Autowired
|
||||
private ISysUserService userService;
|
||||
|
||||
@@ -54,8 +53,7 @@ public class SysUserController extends BaseController
|
||||
@ApiOperation("获取用户分页列表")
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:list')")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo list(SysUser user)
|
||||
{
|
||||
public TableDataInfo list(SysUser user) {
|
||||
startPage();
|
||||
// if (null == user.getDeptId()) {
|
||||
// user.setDeptId(getLoginUser().getDeptId());
|
||||
@@ -68,8 +66,7 @@ public class SysUserController extends BaseController
|
||||
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:export')")
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, SysUser user)
|
||||
{
|
||||
public void export(HttpServletResponse response, SysUser user) {
|
||||
if (null == user.getDeptId()) {
|
||||
user.setDeptId(getLoginUser().getDeptId());
|
||||
}
|
||||
@@ -82,8 +79,7 @@ public class SysUserController extends BaseController
|
||||
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:import')")
|
||||
@PostMapping("/importData")
|
||||
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
|
||||
{
|
||||
public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
|
||||
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
||||
List<SysUser> userList = util.importExcel(file.getInputStream());
|
||||
String operName = getUsername();
|
||||
@@ -94,8 +90,7 @@ public class SysUserController extends BaseController
|
||||
|
||||
@ApiOperation("下载用户导入模板")
|
||||
@PostMapping("/importTemplate")
|
||||
public void importTemplate(HttpServletResponse response)
|
||||
{
|
||||
public void importTemplate(HttpServletResponse response) {
|
||||
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
||||
util.importTemplateExcel(response, "用户数据");
|
||||
}
|
||||
@@ -105,16 +100,14 @@ public class SysUserController extends BaseController
|
||||
*/
|
||||
@ApiOperation("根据用户编号获取详细信息")
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:query')")
|
||||
@GetMapping(value = { "/", "/{userId}" })
|
||||
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
|
||||
{
|
||||
@GetMapping(value = {"/", "/{userId}"})
|
||||
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
||||
userService.checkUserDataScope(userId);
|
||||
AjaxResult ajax = AjaxResult.success();
|
||||
// List<SysRole> roles = roleService.selectRoleAll();
|
||||
// ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
||||
// ajax.put("posts", postService.selectPostAll());
|
||||
if (StringUtils.isNotNull(userId))
|
||||
{
|
||||
if (StringUtils.isNotNull(userId)) {
|
||||
SysUser sysUser = userService.selectUserById(userId);
|
||||
ajax.put(AjaxResult.DATA_TAG, sysUser);
|
||||
// ajax.put("postIds", postService.selectPostListByUserId(userId));
|
||||
@@ -135,20 +128,14 @@ public class SysUserController extends BaseController
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:add')")
|
||||
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
||||
@PostMapping
|
||||
public AjaxResult add(@Validated @RequestBody SysUser user)
|
||||
{
|
||||
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
|
||||
{
|
||||
public AjaxResult add(@Validated @RequestBody SysUser user) {
|
||||
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
|
||||
return error(StringUtils.format(MessageUtils.message("user.add.failed.name.exists"), user.getUserName()));
|
||||
}
|
||||
else if (StringUtils.isNotEmpty(user.getPhonenumber())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
||||
{
|
||||
} else if (StringUtils.isNotEmpty(user.getPhonenumber())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
|
||||
return error(StringUtils.format(MessageUtils.message("user.add.failed.phone.exists"), user.getUserName()));
|
||||
}
|
||||
else if (StringUtils.isNotEmpty(user.getEmail())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
||||
{
|
||||
} else if (StringUtils.isNotEmpty(user.getEmail())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
|
||||
return error(StringUtils.format(MessageUtils.message("user.add.failed.email.exists"), user.getUserName()));
|
||||
}
|
||||
user.setCreateBy(getUsername());
|
||||
@@ -165,26 +152,22 @@ public class SysUserController extends BaseController
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
|
||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping
|
||||
public AjaxResult edit(@Validated @RequestBody SysUser user)
|
||||
{
|
||||
public AjaxResult edit(@Validated @RequestBody SysUser user) {
|
||||
userService.checkUserAllowed(user);
|
||||
userService.checkUserDataScope(user.getUserId());
|
||||
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user)))
|
||||
{
|
||||
if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user))) {
|
||||
return error(StringUtils.format(MessageUtils.message("user.update.failed.name.exists"), user.getUserName()));
|
||||
}
|
||||
else if (StringUtils.isNotEmpty(user.getPhonenumber())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
|
||||
{
|
||||
} else if (StringUtils.isNotEmpty(user.getPhonenumber())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
|
||||
return error(StringUtils.format(MessageUtils.message("user.update.failed.phone.exists"), user.getUserName()));
|
||||
}
|
||||
else if (StringUtils.isNotEmpty(user.getEmail())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
|
||||
{
|
||||
} else if (StringUtils.isNotEmpty(user.getEmail())
|
||||
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
|
||||
return error(StringUtils.format(MessageUtils.message("user.update.failed.email.exists"), user.getUserName()));
|
||||
}
|
||||
user.setUpdateBy(getUsername());
|
||||
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
||||
if (!StringUtils.isEmpty(user.getPassword())) {
|
||||
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
||||
}
|
||||
user.setDisplayPassword(user.getPassword());
|
||||
return toAjax(userService.updateUser(user));
|
||||
}
|
||||
@@ -196,10 +179,8 @@ public class SysUserController extends BaseController
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:remove')")
|
||||
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{userIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] userIds)
|
||||
{
|
||||
if (ArrayUtils.contains(userIds, getUserId()))
|
||||
{
|
||||
public AjaxResult remove(@PathVariable Long[] userIds) {
|
||||
if (ArrayUtils.contains(userIds, getUserId())) {
|
||||
return error(MessageUtils.message("user.delete.failed"));
|
||||
}
|
||||
return toAjax(userService.deleteUserByIds(userIds));
|
||||
@@ -212,8 +193,7 @@ public class SysUserController extends BaseController
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/resetPwd")
|
||||
public AjaxResult resetPwd(@RequestBody SysUser user)
|
||||
{
|
||||
public AjaxResult resetPwd(@RequestBody SysUser user) {
|
||||
userService.checkUserAllowed(user);
|
||||
userService.checkUserDataScope(user.getUserId());
|
||||
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
||||
@@ -229,8 +209,7 @@ public class SysUserController extends BaseController
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
|
||||
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changeStatus")
|
||||
public AjaxResult changeStatus(@RequestBody SysUser user)
|
||||
{
|
||||
public AjaxResult changeStatus(@RequestBody SysUser user) {
|
||||
userService.checkUserAllowed(user);
|
||||
userService.checkUserDataScope(user.getUserId());
|
||||
user.setUpdateBy(getUsername());
|
||||
@@ -243,8 +222,7 @@ public class SysUserController extends BaseController
|
||||
@ApiOperation("根据用户编号获取授权角色")
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:query')")
|
||||
@GetMapping("/authRole/{userId}")
|
||||
public AjaxResult authRole(@PathVariable("userId") Long userId)
|
||||
{
|
||||
public AjaxResult authRole(@PathVariable("userId") Long userId) {
|
||||
AjaxResult ajax = AjaxResult.success();
|
||||
SysUser user = userService.selectUserById(userId);
|
||||
List<SysRole> roles = roleService.selectRolesByUserId(userId);
|
||||
@@ -260,8 +238,7 @@ public class SysUserController extends BaseController
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:edit')")
|
||||
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
||||
@PutMapping("/authRole")
|
||||
public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
|
||||
{
|
||||
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
|
||||
userService.checkUserDataScope(userId);
|
||||
userService.insertUserAuth(userId, roleIds);
|
||||
return success();
|
||||
@@ -273,8 +250,7 @@ public class SysUserController extends BaseController
|
||||
@ApiOperation("获取部门树列表")
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:list')")
|
||||
@GetMapping("/deptTree")
|
||||
public AjaxResult deptTree(SysDept dept)
|
||||
{
|
||||
public AjaxResult deptTree(SysDept dept) {
|
||||
return success(deptService.selectDeptTreeList(dept));
|
||||
}
|
||||
|
||||
@@ -286,8 +262,7 @@ public class SysUserController extends BaseController
|
||||
@ApiOperation("获取用户分页列表")
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:list')")
|
||||
@GetMapping("/listTerminal")
|
||||
public TableDataInfo listTerminal(SysUser user)
|
||||
{
|
||||
public TableDataInfo listTerminal(SysUser user) {
|
||||
startPage();
|
||||
List<SysUser> list = userService.listTerminal(user);
|
||||
return getDataTable(list);
|
||||
@@ -300,8 +275,7 @@ public class SysUserController extends BaseController
|
||||
@ApiOperation("根据机构id获取当前用户列表")
|
||||
// @PreAuthorize("@ss.hasPermi('system:user:list')")
|
||||
@GetMapping("/getByDeptId")
|
||||
public TableDataInfo getByDeptId()
|
||||
{
|
||||
public TableDataInfo getByDeptId() {
|
||||
startPage();
|
||||
List<SysUser> list = userService.selectByDeptId();
|
||||
return getDataTable(list);
|
||||
@@ -311,8 +285,7 @@ public class SysUserController extends BaseController
|
||||
* 根据机构id获取当前用户列表
|
||||
*/
|
||||
@GetMapping("/getByRoleId")
|
||||
public TableDataInfo getByRoleId(@RequestParam Long id)
|
||||
{
|
||||
public TableDataInfo getByRoleId(@RequestParam Long id) {
|
||||
startPage();
|
||||
List<SysUser> list = userService.selectByRoleId(id);
|
||||
return getDataTable(list);
|
||||
|
||||
Reference in New Issue
Block a user