From 23f6214ce4b7c918e46679820d41128507631eef Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 26 五月 2026 09:24:51 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 3aa58e7..c9b1420 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
@@ -25,6 +25,8 @@
import com.xiaopeng.common.log.enums.AdminOperationType;
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;
@@ -87,6 +89,7 @@
/**
* 获取用户列表
*/
+ @RequiresPermissions(value = {"sysUser:list"}, logical = Logical.OR)
@GetMapping("/api/v1/sys-user/pageList")
@ApiOperation(value = "账号管理分页列表", tags = {"管理后台-账号管理"})
public AjaxResult<PageInfo<SysUser>> list(final SysUserListQuery sysUserListQuery) {
@@ -102,6 +105,9 @@
});
return AjaxResult.success(page);
}
+
+
+
/**
* 获取用户不分页列表
*/
@@ -124,6 +130,7 @@
/**
* 新增用户
*/
+ @RequiresPermissions(value = {"sysUser:add"}, logical = Logical.OR)
@PostMapping("/api/v1/sys-user/add")
@ApiOperation(value = "添加帐号", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -233,6 +240,7 @@
/**
* 修改用户
*/
+ @RequiresPermissions(value = {"sysUser:edit"}, logical = Logical.OR)
@PutMapping("/api/v1/sys-user/edit")
@ApiOperation(value = "编辑帐号", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -274,9 +282,12 @@
@Resource
private TokenService tokenService;
+
+
/**
* 删除用户
*/
+ @RequiresPermissions(value = {"sysUser:delete"}, logical = Logical.OR)
@DeleteMapping("/api/v1/sys-user/{userIds}")
@ApiOperation(value = "删除账号", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -292,9 +303,10 @@
return toAjax(userService.deleteUserByIds(userIds));
}
-
+
+ @RequiresPermissions(value = {"sysUser:disable"}, logical = Logical.OR)
@PostMapping("/api/v1/sys-user/switchStatus/{id}")
@ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -376,6 +388,7 @@
/**
* 重置密码
*/
+ @RequiresPermissions(value = {"sysUser:resetPassword"}, logical = Logical.OR)
@PutMapping("/api/v1/sys-user/rePassword")
@ApiOperation(value = "重置密码", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
--
Gitblit v1.7.1