提交 5bb93ae3 authored 作者: 吕本才's avatar 吕本才

1、增加按照用户id查询用户信息

上级 cd550b21
package com.sfa.system.controller.query; package com.sfa.system.controller.query;
import cn.hutool.core.util.ObjectUtil;
import com.sfa.common.core.domain.R; import com.sfa.common.core.domain.R;
import com.sfa.common.core.utils.StringUtils; import com.sfa.common.core.utils.StringUtils;
import com.sfa.common.core.utils.poi.ExcelUtil; import com.sfa.common.core.utils.poi.ExcelUtil;
...@@ -39,13 +40,12 @@ import java.util.stream.Collectors; ...@@ -39,13 +40,12 @@ import java.util.stream.Collectors;
/** /**
* 用户信息 * 用户信息
* *
* @author ruoyi * @author ruoyi
*/ */
@RestController @RestController
@RequestMapping("/user") @RequestMapping("/user")
public class SysUserQueryController extends BaseController public class SysUserQueryController extends BaseController {
{
@Autowired @Autowired
private ISysUserDao userDao; private ISysUserDao userDao;
...@@ -72,16 +72,14 @@ public class SysUserQueryController extends BaseController ...@@ -72,16 +72,14 @@ public class SysUserQueryController extends BaseController
*/ */
@RequiresPermissions("system:user:list") @RequiresPermissions("system:user:list")
@GetMapping("/list") @GetMapping("/list")
public PageInfo list(UserVo userVo) public PageInfo list(UserVo userVo) {
{
return userQueryService.selectUserPage(userVo); return userQueryService.selectUserPage(userVo);
} }
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export") @RequiresPermissions("system:user:export")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, SysUser user) public void export(HttpServletResponse response, SysUser user) {
{
List<SysUser> list = userDao.selectUserList(user); List<SysUser> list = userDao.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, "用户数据");
...@@ -90,8 +88,7 @@ public class SysUserQueryController extends BaseController ...@@ -90,8 +88,7 @@ public class SysUserQueryController extends BaseController
@Log(title = "用户管理", businessType = BusinessType.IMPORT) @Log(title = "用户管理", businessType = BusinessType.IMPORT)
@RequiresPermissions("system:user:import") @RequiresPermissions("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 = SecurityUtils.getUsername(); String operName = SecurityUtils.getUsername();
...@@ -100,8 +97,7 @@ public class SysUserQueryController extends BaseController ...@@ -100,8 +97,7 @@ public class SysUserQueryController extends BaseController
} }
@PostMapping("/importTemplate") @PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) throws IOException public void importTemplate(HttpServletResponse response) throws IOException {
{
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class); ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
util.importTemplateExcel(response, "用户数据"); util.importTemplateExcel(response, "用户数据");
} }
...@@ -111,11 +107,9 @@ public class SysUserQueryController extends BaseController ...@@ -111,11 +107,9 @@ public class SysUserQueryController extends BaseController
*/ */
@InnerAuth @InnerAuth
@GetMapping("/info/{username}") @GetMapping("/info/{username}")
public R<LoginUser> info(@PathVariable("username") String username) public R<LoginUser> info(@PathVariable("username") String username) {
{
SysUser sysUser = userDao.selectUserByUserName(username); SysUser sysUser = userDao.selectUserByUserName(username);
if (StringUtils.isNull(sysUser)) if (StringUtils.isNull(sysUser)) {
{
return R.fail("用户名或密码错误"); return R.fail("用户名或密码错误");
} }
// 角色集合 // 角色集合
...@@ -129,43 +123,51 @@ public class SysUserQueryController extends BaseController ...@@ -129,43 +123,51 @@ public class SysUserQueryController extends BaseController
return R.ok(sysUserVo); return R.ok(sysUserVo);
} }
@InnerAuth
@GetMapping("/userInfoById")
public R<SysUser> userInfo(Long userId) {
SysUser user =new SysUser(userId);
List<SysUser> list = userDao.selectUserList(user);
if(ObjectUtil.isEmpty(list)){
return R.fail("用户名或密码错误");
}
SysUser sysUser = list.get(0);
return R.ok(sysUser);
}
/** /**
* 注册用户信息 * 注册用户信息
*/ */
@InnerAuth @InnerAuth
@PostMapping("/register") @PostMapping("/register")
public R<Boolean> register(@RequestBody SysUser sysUser) public R<Boolean> register(@RequestBody SysUser sysUser) {
{
String username = sysUser.getUserName(); String username = sysUser.getUserName();
if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser")))) if (!("true".equals(sysConfigDao.selectConfigByKey("sys.account.registerUser")))) {
{
return R.fail("当前系统没有开启注册功能!"); return R.fail("当前系统没有开启注册功能!");
} }
if (!userDao.checkUserNameUnique(sysUser)) if (!userDao.checkUserNameUnique(sysUser)) {
{
return R.fail("保存用户'" + username + "'失败,注册账号已存在"); return R.fail("保存用户'" + username + "'失败,注册账号已存在");
} }
return R.ok(userDao.registerUser(sysUser)); return R.ok(userDao.registerUser(sysUser));
} }
/** /**
*记录用户登录IP地址和登录时间 * 记录用户登录IP地址和登录时间
*/ */
@InnerAuth @InnerAuth
@PutMapping("/recordlogin") @PutMapping("/recordlogin")
public R<Boolean> recordlogin(@RequestBody SysUser sysUser) public R<Boolean> recordlogin(@RequestBody SysUser sysUser) {
{
return R.ok(userDao.updateUserProfile(sysUser)); return R.ok(userDao.updateUserProfile(sysUser));
} }
/** /**
* 登录后获取用户信息 * 登录后获取用户信息
* *
* @return 用户信息 * @return 用户信息
*/ */
@GetMapping("/getInfo") @GetMapping("/getInfo")
public AjaxResult getInfo() public AjaxResult getInfo() {
{
SysUser user = userDao.selectUserById(SecurityUtils.getUserId()); SysUser user = userDao.selectUserById(SecurityUtils.getUserId());
UserDto userDto = new UserDto(); UserDto userDto = new UserDto();
BeanUtils.copyProperties(user, userDto); BeanUtils.copyProperties(user, userDto);
...@@ -191,16 +193,14 @@ public class SysUserQueryController extends BaseController ...@@ -191,16 +193,14 @@ public class SysUserQueryController extends BaseController
* 根据用户编号获取详细信息 * 根据用户编号获取详细信息
*/ */
@RequiresPermissions("system:user:query") @RequiresPermissions("system:user:query")
@GetMapping(value = { "/", "/{userId}" }) @GetMapping(value = {"/", "/{userId}"})
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
{
userDao.checkUserDataScope(userId); userDao.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
List<SysRole> roles = sysRoleDao.selectRoleAll(); List<SysRole> roles = sysRoleDao.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", sysPostDao.selectPostAll()); ajax.put("posts", sysPostDao.selectPostAll());
if (StringUtils.isNotNull(userId)) if (StringUtils.isNotNull(userId)) {
{
SysUser sysUser = userDao.selectUserById(userId); SysUser sysUser = userDao.selectUserById(userId);
UserDto userDto = new UserDto(); UserDto userDto = new UserDto();
BeanUtils.copyProperties(sysUser, userDto); BeanUtils.copyProperties(sysUser, userDto);
...@@ -220,59 +220,57 @@ public class SysUserQueryController extends BaseController ...@@ -220,59 +220,57 @@ public class SysUserQueryController extends BaseController
/** /**
* 新增用户 * 新增用户
@RequiresPermissions("system:user:add") @RequiresPermissions("system:user:add")
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping public AjaxResult add(@Validated @RequestBody UserVo userVo)
public AjaxResult add(@Validated @RequestBody UserVo userVo) {
{ sysDeptDao.checkDeptDataScope(userVo.getDeptId());
sysDeptDao.checkDeptDataScope(userVo.getDeptId()); sysRoleDao.checkRoleDataScope(userVo.getRoleIds());
sysRoleDao.checkRoleDataScope(userVo.getRoleIds()); if (!userDao.checkUserNameUnique(user))
if (!userDao.checkUserNameUnique(user)) {
{ return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在");
return error("新增用户'" + user.getUserName() + "'失败,登录账号已存在"); }
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userDao.checkPhoneUnique(user))
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userDao.checkPhoneUnique(user)) {
{ return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
return error("新增用户'" + user.getUserName() + "'失败,手机号码已存在"); }
} else if (StringUtils.isNotEmpty(user.getEmail()) && !userDao.checkEmailUnique(user))
else if (StringUtils.isNotEmpty(user.getEmail()) && !userDao.checkEmailUnique(user)) {
{ return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在");
return error("新增用户'" + user.getUserName() + "'失败,邮箱账号已存在"); }
} userVo.setCreateBy(SecurityUtils.getUsername());
userVo.setCreateBy(SecurityUtils.getUsername()); userVo.setPassword(SecurityUtils.encryptPassword(userVo.getPassword()));
userVo.setPassword(SecurityUtils.encryptPassword(userVo.getPassword())); return toAjax(userDao.insertUser(userVo));
return toAjax(userDao.insertUser(userVo)); }
}
*/ */
/** /**
* 修改用户 * 修改用户
@RequiresPermissions("system:user:edit") @RequiresPermissions("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) {
{ userDao.checkUserAllowed(user);
userDao.checkUserAllowed(user); userDao.checkUserDataScope(user.getUserId());
userDao.checkUserDataScope(user.getUserId()); sysDeptDao.checkDeptDataScope(user.getDeptId());
sysDeptDao.checkDeptDataScope(user.getDeptId()); sysRoleDao.checkRoleDataScope(user.getRoleIds());
sysRoleDao.checkRoleDataScope(user.getRoleIds()); if (!userDao.checkUserNameUnique(user))
if (!userDao.checkUserNameUnique(user)) {
{ return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在"); }
} else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userDao.checkPhoneUnique(user))
else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userDao.checkPhoneUnique(user)) {
{ return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在");
return error("修改用户'" + user.getUserName() + "'失败,手机号码已存在"); }
} else if (StringUtils.isNotEmpty(user.getEmail()) && !userDao.checkEmailUnique(user))
else if (StringUtils.isNotEmpty(user.getEmail()) && !userDao.checkEmailUnique(user)) {
{ return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在");
return error("修改用户'" + user.getUserName() + "'失败,邮箱账号已存在"); }
} user.setUpdateBy(SecurityUtils.getUsername());
user.setUpdateBy(SecurityUtils.getUsername()); return toAjax(userDao.updateUser(user));
return toAjax(userDao.updateUser(user)); }
}
*/ */
...@@ -282,10 +280,8 @@ public class SysUserQueryController extends BaseController ...@@ -282,10 +280,8 @@ public class SysUserQueryController extends BaseController
@RequiresPermissions("system:user:remove") @RequiresPermissions("system:user:remove")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}") @DeleteMapping("/{userIds}")
public AjaxResult remove(@PathVariable Long[] userIds) public AjaxResult remove(@PathVariable Long[] userIds) {
{ if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
if (ArrayUtils.contains(userIds, SecurityUtils.getUserId()))
{
return error("当前用户不能删除"); return error("当前用户不能删除");
} }
return toAjax(userDao.deleteUserByIds(userIds)); return toAjax(userDao.deleteUserByIds(userIds));
...@@ -297,8 +293,7 @@ public class SysUserQueryController extends BaseController ...@@ -297,8 +293,7 @@ public class SysUserQueryController extends BaseController
@RequiresPermissions("system:user:edit") @RequiresPermissions("system:user:edit")
@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) {
{
userDao.checkUserAllowed(user.getUserId()); userDao.checkUserAllowed(user.getUserId());
userDao.checkUserDataScope(user.getUserId()); userDao.checkUserDataScope(user.getUserId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
...@@ -312,8 +307,7 @@ public class SysUserQueryController extends BaseController ...@@ -312,8 +307,7 @@ public class SysUserQueryController extends BaseController
@RequiresPermissions("system:user:edit") @RequiresPermissions("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) {
{
userDao.checkUserAllowed(user.getUserId()); userDao.checkUserAllowed(user.getUserId());
userDao.checkUserDataScope(user.getUserId()); userDao.checkUserDataScope(user.getUserId());
user.setUpdateBy(SecurityUtils.getUsername()); user.setUpdateBy(SecurityUtils.getUsername());
...@@ -325,8 +319,7 @@ public class SysUserQueryController extends BaseController ...@@ -325,8 +319,7 @@ public class SysUserQueryController extends BaseController
*/ */
@RequiresPermissions("system:user:query") @RequiresPermissions("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 = userDao.selectUserById(userId); SysUser user = userDao.selectUserById(userId);
List<SysRole> roles = sysRoleDao.selectRolesByUserId(userId); List<SysRole> roles = sysRoleDao.selectRolesByUserId(userId);
...@@ -341,8 +334,7 @@ public class SysUserQueryController extends BaseController ...@@ -341,8 +334,7 @@ public class SysUserQueryController extends BaseController
@RequiresPermissions("system:user:edit") @RequiresPermissions("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) {
{
userDao.checkUserDataScope(userId); userDao.checkUserDataScope(userId);
sysRoleDao.checkRoleDataScope(roleIds); sysRoleDao.checkRoleDataScope(roleIds);
userDao.insertUserAuth(userId, roleIds); userDao.insertUserAuth(userId, roleIds);
...@@ -354,8 +346,7 @@ public class SysUserQueryController extends BaseController ...@@ -354,8 +346,7 @@ public class SysUserQueryController extends BaseController
*/ */
@RequiresPermissions("system:user:list") @RequiresPermissions("system:user:list")
@GetMapping("/deptTree") @GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept) public AjaxResult deptTree(SysDept dept) {
{
return success(sysDeptDao.selectDeptTreeList(dept)); return success(sysDeptDao.selectDeptTreeList(dept));
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论