From 1b4d9b2dd4ed07758241d1143890b3a86b3c0641 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:15:49 +0800
Subject: [PATCH] 权限管理开发基本功能已完成,待前端对接
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
index 727c0dc..2e0f357 100644
--- a/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
+++ b/hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java
@@ -1,13 +1,15 @@
package com.mes.userinfo.controller;
-import com.mes.base.BaseController;
+import com.mes.entity.request.GeneralRequest;
import com.mes.userinfo.entity.SysUser;
-import com.mes.userinfo.entity.request.UserRequest;
import com.mes.userinfo.entity.vo.SysUserVO;
+import com.mes.userinfo.service.SysUserService;
import com.mes.utils.Result;
-import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -25,10 +27,13 @@
* @author zhoush
* @since 2024-04-11
*/
-@ApiModel("鐢ㄦ埛淇℃伅")
+@Api(description = "鐢ㄦ埛绠＄悊")
@RestController
-@RequestMapping("/userinfo")
-public class SysUserController extends BaseController {
+@RequestMapping("/sys/user")
+public class SysUserController {
+
+ @Autowired
+ private SysUserService sysUserService;
@ApiOperation("鐢ㄦ埛鐧诲綍")
@PostMapping("/login")
@@ -38,6 +43,8 @@
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
+// @PreAuthorize("hasRole('ROLE_admin')")
+ @PreAuthorize("hasAuthority('xt:yh')")
public Result<String> logout() {
return Result.success(sysUserService.logout());
}
@@ -57,17 +64,18 @@
return Result.success(sysUserService.updateUser(sysUser));
}
+ @ApiOperation("閲嶇疆瀵嗙爜")
@PostMapping("/resetPassword")
// @PreAuthorize("hasAuthority('sys:user:resetPassword')")
- public Result resetPassword(@RequestBody Long userId) {
- return Result.success(sysUserService.resetPassword(userId));
+ public Result resetPassword(String userId) {
+ return Result.success(sysUserService.resetPassword(Long.parseLong(userId)));
}
@ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/listByUserName")
// @PreAuthorize("hasAuthority('sys:user:list')")
- public Result<List<SysUserVO>> listByUserName(@RequestBody UserRequest request) {
+ public Result<List<SysUserVO>> listByUserName(@RequestBody GeneralRequest request) {
return Result.success(sysUserService.listByUserName(request));
}
--
Gitblit v1.8.0