|
@@ -3,6 +3,8 @@ package com.ruoyi.web.controller.system;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
+
|
|
|
|
+import com.ruoyi.common.utils.sign.RsaUtils;
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -31,16 +33,16 @@ import com.ruoyi.system.service.ISysDeptService;
|
|
import com.ruoyi.system.service.ISysPostService;
|
|
import com.ruoyi.system.service.ISysPostService;
|
|
import com.ruoyi.system.service.ISysRoleService;
|
|
import com.ruoyi.system.service.ISysRoleService;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
|
+import static com.ruoyi.common.constant.CommonConstants.ONE;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 用户信息
|
|
* 用户信息
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
*/
|
|
*/
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/system/user")
|
|
@RequestMapping("/system/user")
|
|
-public class SysUserController extends BaseController
|
|
|
|
-{
|
|
|
|
|
|
+public class SysUserController extends BaseController {
|
|
@Autowired
|
|
@Autowired
|
|
private ISysUserService userService;
|
|
private ISysUserService userService;
|
|
|
|
|
|
@@ -58,8 +60,7 @@ public class SysUserController extends BaseController
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:list')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:list')")
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
- public TableDataInfo list(SysUser user)
|
|
|
|
- {
|
|
|
|
|
|
+ public TableDataInfo list(SysUser user) {
|
|
startPage();
|
|
startPage();
|
|
List<SysUser> list = userService.selectUserList(user);
|
|
List<SysUser> list = userService.selectUserList(user);
|
|
return getDataTable(list);
|
|
return getDataTable(list);
|
|
@@ -68,8 +69,7 @@ public class SysUserController extends BaseController
|
|
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
|
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
|
|
@PreAuthorize("@ss.hasPermi('system:user:export')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:export')")
|
|
@PostMapping("/export")
|
|
@PostMapping("/export")
|
|
- public void export(HttpServletResponse response, SysUser user)
|
|
|
|
- {
|
|
|
|
|
|
+ public void export(HttpServletResponse response, SysUser user) {
|
|
List<SysUser> list = userService.selectUserList(user);
|
|
List<SysUser> list = userService.selectUserList(user);
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
util.exportExcel(response, list, "用户数据");
|
|
util.exportExcel(response, list, "用户数据");
|
|
@@ -78,8 +78,7 @@ public class SysUserController extends BaseController
|
|
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
|
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
|
|
@PreAuthorize("@ss.hasPermi('system:user:import')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:import')")
|
|
@PostMapping("/importData")
|
|
@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);
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
List<SysUser> userList = util.importExcel(file.getInputStream());
|
|
List<SysUser> userList = util.importExcel(file.getInputStream());
|
|
String operName = getUsername();
|
|
String operName = getUsername();
|
|
@@ -88,8 +87,7 @@ public class SysUserController extends BaseController
|
|
}
|
|
}
|
|
|
|
|
|
@PostMapping("/importTemplate")
|
|
@PostMapping("/importTemplate")
|
|
- public void importTemplate(HttpServletResponse response)
|
|
|
|
- {
|
|
|
|
|
|
+ public void importTemplate(HttpServletResponse response) {
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
|
|
util.importTemplateExcel(response, "用户数据");
|
|
util.importTemplateExcel(response, "用户数据");
|
|
}
|
|
}
|
|
@@ -98,16 +96,14 @@ public class SysUserController extends BaseController
|
|
* 根据用户编号获取详细信息
|
|
* 根据用户编号获取详细信息
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:query')")
|
|
@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);
|
|
userService.checkUserDataScope(userId);
|
|
AjaxResult ajax = AjaxResult.success();
|
|
AjaxResult ajax = AjaxResult.success();
|
|
List<SysRole> roles = roleService.selectRoleAll();
|
|
List<SysRole> roles = roleService.selectRoleAll();
|
|
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
|
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
|
|
ajax.put("posts", postService.selectPostAll());
|
|
ajax.put("posts", postService.selectPostAll());
|
|
- if (StringUtils.isNotNull(userId))
|
|
|
|
- {
|
|
|
|
|
|
+ if (StringUtils.isNotNull(userId)) {
|
|
SysUser sysUser = userService.selectUserById(userId);
|
|
SysUser sysUser = userService.selectUserById(userId);
|
|
ajax.put(AjaxResult.DATA_TAG, sysUser);
|
|
ajax.put(AjaxResult.DATA_TAG, sysUser);
|
|
ajax.put("postIds", postService.selectPostListByUserId(userId));
|
|
ajax.put("postIds", postService.selectPostListByUserId(userId));
|
|
@@ -122,20 +118,18 @@ public class SysUserController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:user:add')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:add')")
|
|
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
@Log(title = "用户管理", businessType = BusinessType.INSERT)
|
|
@PostMapping
|
|
@PostMapping
|
|
- public AjaxResult add(@Validated @RequestBody SysUser user)
|
|
|
|
- {
|
|
|
|
- if (!userService.checkUserNameUnique(user))
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult add(@Validated @RequestBody SysUser user) {
|
|
|
|
+ if (!userService.checkUserNameUnique(user)) {
|
|
return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
- }
|
|
|
|
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
|
|
|
|
- {
|
|
|
|
|
|
+ } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
|
|
return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
|
|
+ } else if (ONE.equals(userService.checkStrongPwd(user))) {
|
|
|
|
+ return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
|
|
}
|
|
}
|
|
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
|
|
|
|
|
|
+/* else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
|
|
{
|
|
{
|
|
return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
user.setCreateBy(getUsername());
|
|
user.setCreateBy(getUsername());
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
return toAjax(userService.insertUser(user));
|
|
return toAjax(userService.insertUser(user));
|
|
@@ -147,22 +141,18 @@ public class SysUserController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@PutMapping
|
|
@PutMapping
|
|
- public AjaxResult edit(@Validated @RequestBody SysUser user)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult edit(@Validated @RequestBody SysUser user) {
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserDataScope(user.getUserId());
|
|
userService.checkUserDataScope(user.getUserId());
|
|
- if (!userService.checkUserNameUnique(user))
|
|
|
|
- {
|
|
|
|
|
|
+ if (!userService.checkUserNameUnique(user)) {
|
|
return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
|
|
- }
|
|
|
|
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
|
|
|
|
- {
|
|
|
|
|
|
+ } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
|
|
return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
|
|
}
|
|
}
|
|
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
|
|
|
|
|
|
+/* else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
|
|
{
|
|
{
|
|
return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
user.setUpdateBy(getUsername());
|
|
user.setUpdateBy(getUsername());
|
|
return toAjax(userService.updateUser(user));
|
|
return toAjax(userService.updateUser(user));
|
|
}
|
|
}
|
|
@@ -173,10 +163,8 @@ public class SysUserController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:user:remove')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:remove')")
|
|
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
@Log(title = "用户管理", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{userIds}")
|
|
@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("当前用户不能删除");
|
|
return error("当前用户不能删除");
|
|
}
|
|
}
|
|
return toAjax(userService.deleteUserByIds(userIds));
|
|
return toAjax(userService.deleteUserByIds(userIds));
|
|
@@ -188,9 +176,11 @@ public class SysUserController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@PutMapping("/resetPwd")
|
|
@PutMapping("/resetPwd")
|
|
- public AjaxResult resetPwd(@RequestBody SysUser user)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult resetPwd(@RequestBody SysUser user) {
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserAllowed(user);
|
|
|
|
+ if (ONE.equals(userService.checkStrongPwd(user))) {
|
|
|
|
+ return AjaxResult.error("密码必须包含数字、大小写字母、特殊符号且大于8位");
|
|
|
|
+ }
|
|
userService.checkUserDataScope(user.getUserId());
|
|
userService.checkUserDataScope(user.getUserId());
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
|
|
user.setUpdateBy(getUsername());
|
|
user.setUpdateBy(getUsername());
|
|
@@ -203,8 +193,7 @@ public class SysUserController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
|
|
@PutMapping("/changeStatus")
|
|
@PutMapping("/changeStatus")
|
|
- public AjaxResult changeStatus(@RequestBody SysUser user)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult changeStatus(@RequestBody SysUser user) {
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserAllowed(user);
|
|
userService.checkUserDataScope(user.getUserId());
|
|
userService.checkUserDataScope(user.getUserId());
|
|
user.setUpdateBy(getUsername());
|
|
user.setUpdateBy(getUsername());
|
|
@@ -216,8 +205,7 @@ public class SysUserController extends BaseController
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:query')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:query')")
|
|
@GetMapping("/authRole/{userId}")
|
|
@GetMapping("/authRole/{userId}")
|
|
- public AjaxResult authRole(@PathVariable("userId") Long userId)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult authRole(@PathVariable("userId") Long userId) {
|
|
AjaxResult ajax = AjaxResult.success();
|
|
AjaxResult ajax = AjaxResult.success();
|
|
SysUser user = userService.selectUserById(userId);
|
|
SysUser user = userService.selectUserById(userId);
|
|
List<SysRole> roles = roleService.selectRolesByUserId(userId);
|
|
List<SysRole> roles = roleService.selectRolesByUserId(userId);
|
|
@@ -232,8 +220,7 @@ public class SysUserController extends BaseController
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:edit')")
|
|
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
|
@Log(title = "用户管理", businessType = BusinessType.GRANT)
|
|
@PutMapping("/authRole")
|
|
@PutMapping("/authRole")
|
|
- public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
|
|
userService.checkUserDataScope(userId);
|
|
userService.checkUserDataScope(userId);
|
|
userService.insertUserAuth(userId, roleIds);
|
|
userService.insertUserAuth(userId, roleIds);
|
|
return success();
|
|
return success();
|
|
@@ -244,8 +231,7 @@ public class SysUserController extends BaseController
|
|
*/
|
|
*/
|
|
@PreAuthorize("@ss.hasPermi('system:user:list')")
|
|
@PreAuthorize("@ss.hasPermi('system:user:list')")
|
|
@GetMapping("/deptTree")
|
|
@GetMapping("/deptTree")
|
|
- public AjaxResult deptTree(SysDept dept)
|
|
|
|
- {
|
|
|
|
|
|
+ public AjaxResult deptTree(SysDept dept) {
|
|
return success(deptService.selectDeptTreeList(dept));
|
|
return success(deptService.selectDeptTreeList(dept));
|
|
}
|
|
}
|
|
}
|
|
}
|