From 4f7fd9e879d9de211b255eb21535a034893ffbff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 五月 2026 16:20:48 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/SysUserController.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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 17bb80a..3aa58e7 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
@@ -124,7 +124,6 @@
/**
* 新增用户
*/
- @Log(title = "帐号管理", businessType = BusinessType.INSERT)
@PostMapping("/api/v1/sys-user/add")
@ApiOperation(value = "添加帐号", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -142,7 +141,7 @@
}
user.setUniqueNumber(generateUniqueNumber());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- //TODO 手机号脱敏存储
+ user.setPhoneNumber(SensitiveDataCryptoUtil.encrypt(user.getPhoneNumber()));
userService.insertUser(user);
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setRoleId(user.getRoleId());
@@ -192,9 +191,17 @@
}
return success();
}
-
-
+
+ /**
+ * 根据用户编号获取详细信息
+ */
+ @ApiOperation(value = "获取用户详情", tags = {"管理后台-系统用户管理"})
+ @GetMapping("/api/v1/getSysUserInfo")
+ public AjaxResult getSysUserInfo() {
+ LoginUser loginUser = tokenService.getLoginUser();
+ return AjaxResult.success(loginUser);
+ }
@@ -226,7 +233,6 @@
/**
* 修改用户
*/
- @Log(title = "帐号管理", businessType = BusinessType.UPDATE)
@PutMapping("/api/v1/sys-user/edit")
@ApiOperation(value = "编辑帐号", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -271,7 +277,6 @@
/**
* 删除用户
*/
- @Log(title = "帐号管理", businessType = BusinessType.DELETE)
@DeleteMapping("/api/v1/sys-user/{userIds}")
@ApiOperation(value = "删除账号", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -371,7 +376,6 @@
/**
* 重置密码
*/
- @Log(title = "帐号管理", businessType = BusinessType.UPDATE)
@PutMapping("/api/v1/sys-user/rePassword")
@ApiOperation(value = "重置密码", tags = {"管理后台-帐号管理"})
@AdminOperationLog(
@@ -393,7 +397,6 @@
/**
* 状态修改
*/
- @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public AjaxResult changeStatus(@RequestBody SysUser user) {
userService.checkUserAllowed(user);
@@ -418,7 +421,6 @@
/**
* 用户授权角色
*/
- @Log(title = "用户管理", businessType = BusinessType.GRANT)
@PutMapping("/authRole")
public AjaxResult insertAuthRole(Long userId, Long[] roleIds) {
userService.checkUserDataScope(userId);
--
Gitblit v1.7.1