From 85bafa86f44fbe6646019fd8ecbab79f552ccd0a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 二月 2026 21:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-service/xp-account/src/main/java/com/xiaopeng/account/controller/SysUserController.java | 183 ++++++++++++++++++++-------------------------
1 files changed, 81 insertions(+), 102 deletions(-)
diff --git a/xp-service/xp-account/src/main/java/com/xiaopeng/account/controller/SysUserController.java b/xp-service/xp-account/src/main/java/com/xiaopeng/account/controller/SysUserController.java
index 7ab678e..cce5683 100644
--- a/xp-service/xp-account/src/main/java/com/xiaopeng/account/controller/SysUserController.java
+++ b/xp-service/xp-account/src/main/java/com/xiaopeng/account/controller/SysUserController.java
@@ -1,36 +1,39 @@
package com.xiaopeng.account.controller;
-import java.util.*;
-import java.util.stream.Collectors;
-import javax.annotation.Resource;
-
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.xiaopeng.common.core.utils.StringUtils;
-import com.xiaopeng.common.core.web.page.PageInfo;
-import com.xiaopeng.common.security.service.TokenService;
-import com.xiaopeng.common.security.annotation.Logical;
+import com.xiaopeng.account.model.dto.UserPwdResetDTO;
+import com.xiaopeng.account.model.query.SysUserListQuery;
import com.xiaopeng.account.service.*;
-import com.xiaopeng.account.vo.GetSysUserList;
-import com.xiaopeng.account.vo.ShopUserStart;
-import com.xiaopeng.api.model.account.SysUserRole;
-import com.xiaopeng.api.model.operation.SysDept;
+import com.xiaopeng.api.model.account.SysRole;
import com.xiaopeng.api.model.account.SysRoleBak;
import com.xiaopeng.api.model.account.SysUser;
+import com.xiaopeng.api.model.account.SysUserRole;
+import com.xiaopeng.api.model.operation.SysDept;
+import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.exception.ServiceException;
+import com.xiaopeng.common.core.utils.StringUtils;
+import com.xiaopeng.common.core.web.controller.BaseController;
+import com.xiaopeng.common.core.web.domain.AjaxResult;
+import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.log.annotation.Log;
+import com.xiaopeng.common.log.enums.BusinessType;
+import com.xiaopeng.common.security.annotation.Logical;
+import com.xiaopeng.common.security.annotation.RequiresPermissions;
+import com.xiaopeng.common.security.service.TokenService;
+import com.xiaopeng.common.security.utils.SecurityUtils;
import io.seata.spring.annotation.GlobalTransactional;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import com.xiaopeng.common.core.domain.R;
-import com.xiaopeng.common.core.web.controller.BaseController;
-import com.xiaopeng.common.core.web.domain.AjaxResult;
-import com.xiaopeng.common.log.annotation.Log;
-import com.xiaopeng.common.log.enums.BusinessType;
-import com.xiaopeng.common.security.annotation.RequiresPermissions;
-import com.xiaopeng.common.security.utils.SecurityUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 用户信息
@@ -38,15 +41,15 @@
* @author ruoyi
*/
@RestController
-@RequestMapping("/user")
-@Api(tags = "用户信息")
public class SysUserController extends BaseController {
@Resource
private ISysUserService userService;
@Resource
- private ISysRoleBakService roleService;
+ private ISysRoleBakService roleBakService;
+ @Resource
+ private ISysRoleService sysRoleService;
@Resource
private ISysDeptService deptService;
@@ -64,11 +67,11 @@
* 获取用户列表
*/
@RequiresPermissions(value = {"/systemUserManagement", "/roleManagement/info"}, logical = Logical.OR)
- @GetMapping("/list")
- @ApiOperation(value = "获取系统用户列表", tags = {"管理后台-系统用户管理", "管理后台-角色管理"})
- public AjaxResult list(GetSysUserList getSysUserList) {
- PageInfo<SysUser> pageInfo = new PageInfo<>(getSysUserList.getPageCurr(), getSysUserList.getPageSize());
- PageInfo<SysUser> page = userService.getList(pageInfo, getSysUserList);
+ @GetMapping("/api/v1/sys-user/pageList")
+ @ApiOperation(value = "账号管理分页列表", tags = {"管理后台-账号管理"})
+ public AjaxResult<PageInfo<SysUser>> list(SysUserListQuery sysUserListQuery) {
+ PageInfo<SysUser> pageInfo = new PageInfo<>(sysUserListQuery.getPageNum(), sysUserListQuery.getPageSize());
+ PageInfo<SysUser> page = userService.getList(pageInfo, sysUserListQuery);
return AjaxResult.success(page);
}
@@ -78,25 +81,25 @@
* 新增用户
*/
@RequiresPermissions(value = {"/systemUserManagement/add"}, logical = Logical.OR)
- @Log(title = "用户管理", businessType = BusinessType.INSERT)
- @PostMapping("/add")
- @ApiOperation(value = "添加系统用户", tags = {"管理后台-系统用户管理"})
+ @Log(title = "帐号管理", businessType = BusinessType.INSERT)
+ @PostMapping("/api/v1/sys-user/add")
+ @ApiOperation(value = "添加帐号", tags = {"管理后台-帐号管理"})
@GlobalTransactional(rollbackFor = Exception.class)//分布式事务
public AjaxResult add(@RequestBody SysUser user) {
- user.setUserName(user.getPhonenumber());
- if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
- user.setNickName(user.getPhonenumber());
- }
- if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+ if (StringUtils.isNotEmpty(user.getPhoneNumber()) && !userService.checkPhoneUnique(user)) {
return error("手机号已开通账号");
}
- if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
+ if (StringUtils.isNotEmpty(user.getUserAccount()) && !userService.checkUserNameUnique(user)) {
return error("登录账号重复");
+ }
+ //校验编号是否唯一
+ Long count = userService.lambdaQuery().eq(SysUser::getUniqueNumber, user.getUniqueNumber()).count();
+ if (count > 0) {
+ return error("用户编号已存在");
}
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setRoleType(1);
- user.setPassWordUpdate(new Date());
+ //TODO 手机号脱敏存储
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(user.getRoleId());
@@ -111,7 +114,7 @@
@ApiOperation(value = "校验账号是否重复", tags = {"管理后台-系统用户管理"})
public AjaxResult verifyUserNameRepeat(@PathVariable String username){
SysUser user = new SysUser();
- user.setUserName(username);
+ user.setUserAccount(username);
if (StringUtils.isNotEmpty(username) && !userService.checkUserNameUnique(user)) {
return error("账号不可重复");
}
@@ -127,18 +130,18 @@
* 根据用户编号获取详细信息
*/
@ApiOperation(value = "获取用户详情", tags = {"管理后台-系统用户管理"})
- @GetMapping("/getInfo/{userId}")
+ @GetMapping("/api/v1/getInfo/{userId}")
public AjaxResult getInfo(@PathVariable Long userId) {
userService.checkUserDataScope(userId);
AjaxResult ajax = AjaxResult.success();
- List<SysRoleBak> roles = roleService.selectRoleAll();
+ List<SysRole> roles = sysRoleService.list();
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)) {
SysUser sysUser = userService.selectUserById(userId);
ajax.put(AjaxResult.DATA_TAG, sysUser);
ajax.put("postIds", postService.selectPostListByUserId(userId));
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRoleBak::getId).collect(Collectors.toList()));
+ // ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getId).collect(Collectors.toList()));
}
return AjaxResult.success(ajax);
}
@@ -148,15 +151,11 @@
* 修改用户
*/
@RequiresPermissions(value = {"/systemUserManagement/update"}, logical = Logical.OR)
- @Log(title = "用户管理", businessType = BusinessType.UPDATE)
- @PutMapping("/update")
- @ApiOperation(value = "编辑系统用户", tags = {"管理后台-系统用户管理"})
+ @Log(title = "帐号管理", businessType = BusinessType.UPDATE)
+ @PutMapping("/api/v1/sys-user/edit")
+ @ApiOperation(value = "编辑帐号", tags = {"管理后台-帐号管理"})
@GlobalTransactional(rollbackFor = Exception.class)//分布式事务
public AjaxResult edit(@Validated @RequestBody SysUser user) {
- user.setUserName(user.getPhonenumber());
- if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
- user.setNickName(user.getPhonenumber());
- }
R<Integer> admin = this.isAdmin(user.getId());
Integer data = admin.getData();
if(data == null || data != 1){
@@ -167,30 +166,23 @@
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getId());
SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
- .eq(SysUser::getPhonenumber, user.getPhonenumber())
- .eq(SysUser::getDelFlag,0)
+ .eq(SysUser::getPhoneNumber, user.getPhoneNumber())
.last("LIMIT 1"));
- if (StringUtils.isNotEmpty(user.getPhonenumber()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
+ if (StringUtils.isNotEmpty(user.getPhoneNumber()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
return error("手机号已开通账号");
}
sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
- .eq(SysUser::getUserName, user.getUserName())
- .eq(SysUser::getDelFlag,0)
+ .eq(SysUser::getUserAccount, user.getUserAccount())
.last("LIMIT 1"));
- if (StringUtils.isNotEmpty(user.getUserName()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
+ if (StringUtils.isNotEmpty(user.getUserAccount()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
return error("登录账号重复");
}
user.setUpdateBy(SecurityUtils.getUsername());
- if (user.getPassword() != null && !"".equals(user.getPassword())) {
+ if (user.getPassword() != null && !user.getPassword().isEmpty()) {
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setPassWordUpdate(new Date());
- }
- if (user.getPhonenumber() != null) {
- user.setUserName(user.getPhonenumber());
}
user.setUpdateBy(SecurityUtils.getUsername());
- user.setUpdateTime(new Date());
userService.updateUser(user);
//删除旧的角色数据，添加新的角色
@@ -209,9 +201,9 @@
* 删除用户
*/
@RequiresPermissions(value = {"/systemUserManagement/del"}, logical = Logical.OR)
- @Log(title = "用户管理", businessType = BusinessType.DELETE)
- @DeleteMapping("/{userIds}")
- @ApiOperation(value = "删除系统用户", tags = {"管理后台-系统用户管理"})
+ @Log(title = "帐号管理", businessType = BusinessType.DELETE)
+ @DeleteMapping("/api/v1/sys-user/{userIds}")
+ @ApiOperation(value = "删除账号", tags = {"管理后台-帐号管理"})
public AjaxResult remove(@PathVariable Long[] userIds) {
if (ArrayUtils.contains(userIds, tokenService.getLoginUser())) {
return error("当前用户不能删除");
@@ -223,21 +215,16 @@
@RequiresPermissions(value = {"/systemUserManagement/forbidden"}, logical = Logical.OR)
- @PostMapping("/shopUserStart")
- @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"})
- public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) {
- if (shopUserStart.getUserId() == null) {
- return AjaxResult.error("userId不能为空");
- }
- SysUser sysUser = userService.selectUserById(shopUserStart.getUserId());
+ @PostMapping("/api/v1/sys-user/switchStatus/{id}")
+ @ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-帐号管理"})
+ public AjaxResult shopUserStart(@ApiParam(name = "id", value = "帐号ID") @PathVariable("id") Long id) {
+ SysUser sysUser = userService.selectUserById(id);
if (sysUser.getStatus().equals("0")) {
sysUser.setStatus("1");
- sysUser.setForbiddenRemark(shopUserStart.getRemark());
} else {
sysUser.setStatus("0");
- sysUser.setForbiddenRemark("");
}
- return toAjax(userService.updateUser(sysUser));
+ return toAjax(userService.updateById(sysUser));
}
@@ -271,7 +258,6 @@
public R<Boolean> updateSysUser(@RequestBody SysUser sysUser) {
try {
sysUser.setUpdateBy(SecurityUtils.getUsername());
- sysUser.setUpdateTime(new Date());
userService.updateUser(sysUser);
if(null != sysUser.getRoleId()){
sysUserRoleService.deleteSysUserRoleByUserId(sysUser.getId());
@@ -298,10 +284,14 @@
* 重置密码
*/
@RequiresPermissions(value = {"/systemUserManagement/reset_passwords"}, logical = Logical.OR)
- @Log(title = "用户管理", businessType = BusinessType.UPDATE)
- @PutMapping("/resetPwd")
- @ApiOperation(value = "重置密码", tags = {"管理后台-系统用户管理"})
- public AjaxResult resetPwd(@RequestBody SysUser user) {
+ @Log(title = "帐号管理", businessType = BusinessType.UPDATE)
+ @PutMapping("/api/v1/sys-user/rePassword")
+ @ApiOperation(value = "重置密码", tags = {"管理后台-帐号管理"})
+ public AjaxResult resetPwd(@RequestBody UserPwdResetDTO dto) {
+ SysUser user = userService.getById(dto.getUserId());
+ if (Objects.isNull(user)) {
+ throw new ServiceException("用户不存在");
+ }
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -328,7 +318,7 @@
public AjaxResult authRole(@PathVariable("userId") Long userId) {
AjaxResult ajax = AjaxResult.success();
SysUser user = userService.selectUserById(userId);
- List<SysRoleBak> roles = roleService.selectRolesByUserId(userId);
+ List<SysRoleBak> roles = roleBakService.selectRolesByUserId(userId);
ajax.put("user", user);
ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
return ajax;
@@ -364,14 +354,14 @@
* @return
*/
@PostMapping("/queryRoleByUserId/{userId}")
- public R<SysRoleBak> queryRoleByUserId(@PathVariable("userId") Long userId){
+ public R<SysRole> queryRoleByUserId(@PathVariable("userId") Long userId){
SysUserRole one = sysUserRoleService.getOne(Wrappers.lambdaQuery(SysUserRole.class)
.eq(SysUserRole::getUserId, userId)
.last("LIMIT 1"));
System.out.println("通过用户id查询角色对象"+one);
if(Objects.nonNull(one)){
- SysRoleBak byId = roleService.getOne(Wrappers.lambdaQuery(SysRoleBak.class)
- .eq(SysRoleBak::getId,one.getRoleId())
+ SysRole byId = sysRoleService.getOne(Wrappers.lambdaQuery(SysRole.class)
+ .eq(SysRole::getId,one.getRoleId())
.last("LIMIT 1"));
return R.ok(byId);
}
@@ -380,9 +370,9 @@
@PostMapping("/queryRoleByRoleId/{roleId}")
- public R<SysRoleBak> queryRoleByRoleId(@PathVariable("roleId") Long roleId){
- return R.ok( roleService.getOne(Wrappers.lambdaQuery(SysRoleBak.class)
- .eq(SysRoleBak::getId, roleId)
+ public R<SysRole> queryRoleByRoleId(@PathVariable("roleId") Long roleId){
+ return R.ok( sysRoleService.getOne(Wrappers.lambdaQuery(SysRole.class)
+ .eq(SysRole::getId, roleId)
.last("LIMIT 1")));
}
@@ -394,8 +384,7 @@
@PostMapping("/queryUserByPhoneList")
public R<List<SysUser>> queryUserByPhoneList(@RequestBody List<String> phoneList){
List<SysUser> list = userService.list(Wrappers.lambdaQuery(SysUser.class)
- .in(SysUser::getPhonenumber, phoneList)
- .ne(SysUser::getDelFlag,2));
+ .in(SysUser::getPhoneNumber, phoneList));
return R.ok(list);
}
@@ -408,7 +397,7 @@
@PostMapping("/queryUserByPhone")
public R<SysUser> queryUserByPhone(@RequestBody String phone){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
- .eq(SysUser::getPhonenumber, phone)
+ .eq(SysUser::getPhoneNumber, phone)
.last("LIMIT 1"));
return R.ok(user);
}
@@ -423,7 +412,7 @@
@PostMapping("/queryUserByUserName")
public R<SysUser> queryUserByUserName(@RequestBody String userName){
SysUser user = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
- .eq(SysUser::getUserName, userName)
+ .eq(SysUser::getUserAccount, userName)
.last("LIMIT 1"));
return R.ok(user);
}
@@ -437,24 +426,14 @@
@PostMapping("/addSysUser")
@Transactional(rollbackFor = Exception.class)
public R<Long> addSysUser(@RequestBody SysUser user) {
- if(StringUtils.isEmpty(user.getUserName())){
- user.setUserName(user.getPhonenumber());
- }
- if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
- user.setNickName(user.getPhonenumber());
- }
// if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
// throw new RuntimeException("手机号已开通账号");
// }
- if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
+ if (StringUtils.isNotEmpty(user.getUserAccount()) && !userService.checkUserNameUnique(user)) {
throw new RuntimeException("登录账号已存在");
}
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- if(null == user.getRoleType()){
- user.setRoleType(1);
- }
- user.setPassWordUpdate(new Date());
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(user.getRoleId());
--
Gitblit v1.7.1