From 4d7a208f388e42e7dd83dab0e38eadfa0847de1c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 11 十二月 2024 19:24:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index b4965b7..067624c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -10,6 +10,8 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.other.api.domain.TUserSite;
import com.ruoyi.other.api.feignClient.RoleSiteClient;
import com.ruoyi.other.api.feignClient.UserSiteClient;
@@ -88,6 +90,7 @@
/**
* 获取用户列表
*/
+ @RequiresPermissions(value = {"/systemUserManagement", "/roleManagement/info"}, logical = Logical.OR)
@GetMapping("/list")
@ApiOperation(value = "获取系统用户列表", tags = {"管理后台-系统用户管理", "管理后台-角色管理"})
public AjaxResult list(GetSysUserList getSysUserList) {
@@ -108,6 +111,7 @@
/**
* 新增用户
*/
+ @RequiresPermissions(value = {"/systemUserManagement/add"}, logical = Logical.OR)
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping("/add")
@ApiOperation(value = "添加系统用户", tags = {"管理后台-系统用户管理"})
@@ -144,6 +148,7 @@
}
+ @RequiresPermissions(value = {"/systemUserManagement/add", "/systemUserManagement/update"}, logical = Logical.OR)
@GetMapping("/verifyUserNameRepeat/{username}")
@ApiOperation(value = "校验账号是否重复", tags = {"管理后台-系统用户管理"})
public AjaxResult verifyUserNameRepeat(@PathVariable String username){
@@ -155,6 +160,9 @@
return success();
}
+
+
+ @RequiresPermissions(value = {"/systemUserManagement/update"}, logical = Logical.OR)
@GetMapping("/getRoleSiteName/{roleId}")
@ApiOperation(value = "获取角色对应的站点名称", tags = {"管理后台-系统用户管理"})
public AjaxResult<List<String>> getRoleSiteName(@PathVariable Integer roleId){
@@ -199,6 +207,7 @@
/**
* 修改用户
*/
+ @RequiresPermissions(value = {"/systemUserManagement/update"}, logical = Logical.OR)
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/update")
@ApiOperation(value = "编辑系统用户", tags = {"管理后台-系统用户管理"})
@@ -258,15 +267,17 @@
return success();
}
-
+ @Resource
+ private TokenService tokenService;
/**
* 删除用户
*/
+ @RequiresPermissions(value = {"/systemUserManagement/del"}, logical = Logical.OR)
@Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
@ApiOperation(value = "删除系统用户", tags = {"管理后台-系统用户管理"})
public AjaxResult remove(@PathVariable Long[] userIds) {
- if (ArrayUtils.contains(userIds, SecurityUtils.getUserId())) {
+ if (ArrayUtils.contains(userIds, tokenService.getLoginUser().getUserid())) {
return error("当前用户不能删除");
}
return toAjax(userService.deleteUserByIds(userIds));
@@ -275,6 +286,7 @@
+ @RequiresPermissions(value = {"/systemUserManagement/forbidden"}, logical = Logical.OR)
@PostMapping("/shopUserStart")
@ApiOperation(value = "账号管理--禁用/启用", tags = {"管理后台-系统用户管理"})
public AjaxResult shopUserStart(@RequestBody ShopUserStart shopUserStart) {
@@ -354,7 +366,7 @@
}
@PostMapping("/getSysUser")
- public R<SysUser> getSysUser(@RequestBody Long userId) {
+ public R<SysUser> getSysUser(@RequestParam("userId") Long userId) {
try {
SysUser sysUser = userService.selectUserById(userId);
return R.ok(sysUser);
@@ -509,7 +521,7 @@
*/
@GetMapping("/getInfo")
public AjaxResult getInfo() {
- SysUser user = userService.selectUserById(SecurityUtils.getUserId());
+ SysUser user = userService.selectUserById(tokenService.getLoginUser().getUserid());
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
@@ -525,6 +537,7 @@
/**
* 重置密码
*/
+ @RequiresPermissions(value = {"/systemUserManagement/reset_passwords"}, logical = Logical.OR)
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd")
@ApiOperation(value = "重置密码", tags = {"管理后台-系统用户管理"})
@@ -679,19 +692,18 @@
@ResponseBody
@PostMapping("/addSysUser")
@Transactional(rollbackFor = Exception.class)
- public R addSysUser(@RequestBody SysUser user){
- System.err.println("事务ID：" + RootContext.getXID());
+ 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)) {
- return R.fail("手机号已开通账号");
- }
+// if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+// throw new RuntimeException("手机号已开通账号");
+// }
if (StringUtils.isNotEmpty(user.getUserName()) && !userService.checkUserNameUnique(user)) {
- return R.fail("登录账号已存在");
+ throw new RuntimeException("登录账号已存在");
}
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -703,7 +715,7 @@
sysUserRole.setRoleId(user.getRoleId());
sysUserRole.setUserId(user.getUserId());
userRoleService.insertSysUserRole(sysUserRole);
- return R.ok();
+ return R.ok(user.getUserId());
}
--
Gitblit v1.7.1