From 2996980930ea678d56fde08e5515d3f1b6ab52bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 14 二月 2026 09:26:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java | 50 +++++++++++++++-----------------------------------
1 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
index ad9a758..8e3a174 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java
@@ -7,12 +7,9 @@
import com.xiaopeng.account.model.dto.UserPwdResetDTO;
import com.xiaopeng.account.model.query.SysUserListQuery;
import com.xiaopeng.account.service.*;
-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.account.SysDept;
+import com.xiaopeng.api.model.account.*;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.core.enums.DisabledEnum;
import com.xiaopeng.common.core.exception.ServiceException;
import com.xiaopeng.common.core.utils.RSAUtil;
import com.xiaopeng.common.core.utils.StringUtils;
@@ -22,8 +19,6 @@
import com.xiaopeng.common.log.annotation.Log;
import com.xiaopeng.common.log.enums.BusinessType;
import com.xiaopeng.common.redis.service.RedisService;
-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.swagger.annotations.ApiOperation;
@@ -72,7 +67,6 @@
/**
* 获取用户列表
*/
- @RequiresPermissions(value = {"/systemUserManagement", "/roleManagement/info"}, logical = Logical.OR)
@GetMapping("/api/v1/sys-user/pageList")
@ApiOperation(value = "账号管理分页列表", tags = {"管理后台-账号管理"})
public AjaxResult<PageInfo<SysUser>> list(SysUserListQuery sysUserListQuery) {
@@ -86,7 +80,6 @@
/**
* 新增用户
*/
- @RequiresPermissions(value = {"/systemUserManagement/add"}, logical = Logical.OR)
@Log(title = "帐号管理", businessType = BusinessType.INSERT)
@PostMapping("/api/v1/sys-user/add")
@ApiOperation(value = "添加帐号", tags = {"管理后台-帐号管理"})
@@ -102,7 +95,6 @@
if (count > 0) {
throw new ServiceException("用户编号已存在", I18nKeyConstant.ACCOUNT_UNIQUE_NUMBER_DUPLICATE);
}
- user.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
//TODO 手机号脱敏存储
userService.insertUser(user);
@@ -114,7 +106,6 @@
}
- @RequiresPermissions(value = {"/systemUserManagement/add", "/systemUserManagement/update"}, logical = Logical.OR)
@GetMapping("/verifyUserNameRepeat/{username}")
@ApiOperation(value = "校验账号是否重复", tags = {"管理后台-系统用户管理"})
public AjaxResult verifyUserNameRepeat(@PathVariable String username){
@@ -155,18 +146,10 @@
/**
* 修改用户
*/
- @RequiresPermissions(value = {"/systemUserManagement/update"}, logical = Logical.OR)
@Log(title = "帐号管理", businessType = BusinessType.UPDATE)
@PutMapping("/api/v1/sys-user/edit")
@ApiOperation(value = "编辑帐号", tags = {"管理后台-帐号管理"})
public AjaxResult edit(@Validated @RequestBody SysUser user) {
- R<Integer> admin = this.isAdmin(user.getId());
- Integer data = admin.getData();
- if(data == null || data != 1){
- SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getId()));
- one.setRoleId(user.getRoleId());
- sysUserRoleService.updateSysUserRole(one);
- }
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getId());
SysUser sysUser = userService.getOne(Wrappers.lambdaQuery(SysUser.class)
@@ -182,12 +165,10 @@
if (StringUtils.isNotEmpty(user.getUserAccount()) && (Objects.nonNull(sysUser) && !user.getId().equals(sysUser.getId()) )) {
throw new ServiceException("登录账号重复", I18nKeyConstant.ACCOUNT_DUPLICATE);
}
- user.setUpdateBy(SecurityUtils.getUsername());
if (user.getPassword() != null && !user.getPassword().isEmpty()) {
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setPassword(null);
}
- user.setUpdateBy(SecurityUtils.getUsername());
- userService.updateUser(user);
+ userService.updateById(user);
//删除旧的角色数据，添加新的角色
sysUserRoleService.remove(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, user.getId()));
@@ -204,7 +185,6 @@
/**
* 删除用户
*/
- @RequiresPermissions(value = {"/systemUserManagement/del"}, logical = Logical.OR)
@Log(title = "帐号管理", businessType = BusinessType.DELETE)
@DeleteMapping("/api/v1/sys-user/{userIds}")
@ApiOperation(value = "删除账号", tags = {"管理后台-帐号管理"})
@@ -218,15 +198,14 @@
- @RequiresPermissions(value = {"/systemUserManagement/forbidden"}, logical = Logical.OR)
@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 sysUser = userService.getById(id);
+ if (sysUser.getStatus().equals(DisabledEnum.NO.getCode())) {
+ sysUser.setStatus(DisabledEnum.YES.getCode());
} else {
- sysUser.setStatus("0");
+ sysUser.setStatus(DisabledEnum.NO.getCode());
}
return toAjax(userService.updateById(sysUser));
}
@@ -240,10 +219,13 @@
@PostMapping("/isAdmin")
- public R<Integer> isAdmin(@RequestBody Long userId){
+ public R<Long> isAdmin(@RequestBody Long userId){
+ Long id = null;
SysUserRole one = sysUserRoleService.getOne(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
- Long id =one.getRoleId();
- return R.ok(id.intValue());
+ if (Objects.nonNull(one)) {
+ id =one.getRoleId();
+ }
+ return R.ok(id);
}
@PostMapping("/getSysUser")
@@ -287,7 +269,6 @@
/**
* 重置密码
*/
- @RequiresPermissions(value = {"/systemUserManagement/reset_passwords"}, logical = Logical.OR)
@Log(title = "帐号管理", businessType = BusinessType.UPDATE)
@PutMapping("/api/v1/sys-user/rePassword")
@ApiOperation(value = "重置密码", tags = {"管理后台-帐号管理"})
@@ -299,8 +280,7 @@
userService.checkUserAllowed(user);
// userService.checkUserDataScope(user.getId());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(userService.resetPwd(user));
+ return toAjax(userService.updateById(user));
}
/**
--
Gitblit v1.7.1