From 2e1b594ca9bbd2af5b4e713746221705591ada52 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 29 四月 2024 09:42:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 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 4351325..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,14 +1,16 @@
package com.mes.userinfo.controller;
+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;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,9 +27,9 @@
* @author zhoush
* @since 2024-04-11
*/
-@ApiModel("鐢ㄦ埛淇℃伅")
+@Api(description = "鐢ㄦ埛绠＄悊")
@RestController
-@RequestMapping("/userinfo")
+@RequestMapping("/sys/user")
public class SysUserController {
@Autowired
@@ -41,34 +43,48 @@
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
+// @PreAuthorize("hasRole('ROLE_admin')")
+ @PreAuthorize("hasAuthority('xt:yh')")
public Result<String> logout() {
return Result.success(sysUserService.logout());
}
@ApiOperation("鏂板鐢ㄦ埛淇℃伅")
@PostMapping("/saveUser")
- public Result<SysUserVO> saveUser(@RequestBody SysUserVO sysUser) {
+// @PreAuthorize("hasAuthority('sys:user:save')")
+ public Result<String> saveUser(@Validated @RequestBody SysUserVO sysUser) {
return Result.success(sysUserService.saveUser(sysUser));
}
- @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
- @PostMapping("/listByUserName")
- public Result<List<SysUserVO>> listByUserName(@RequestBody UserRequest request) {
- return Result.success(sysUserService.listByUserName(request));
- }
@ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
- public Result<SysUserVO> updateUser(@RequestBody SysUserVO sysUser) {
+// @PreAuthorize("hasAuthority('sys:user:update')")
+ public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
return Result.success(sysUserService.updateUser(sysUser));
+ }
+
+ @ApiOperation("閲嶇疆瀵嗙爜")
+ @PostMapping("/resetPassword")
+// @PreAuthorize("hasAuthority('sys:user:resetPassword')")
+ 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 GeneralRequest request) {
+ return Result.success(sysUserService.listByUserName(request));
}
@ApiOperation("鍒犻櫎鐢ㄦ埛淇℃伅")
@PostMapping("/deleteUser")
- public Result<String> deleteUser(@RequestBody SysUserVO sysUser) {
- return Result.success(sysUserService.deleteUser(sysUser));
+// @PreAuthorize("hasAuthority('sys:user:delete')")
+ public Result<String> deleteUser(@RequestBody List<Long> ids) {
+ return Result.success(sysUserService.deleteUser(ids));
}
-
}
--
Gitblit v1.8.0