From 866c5588d497cbf28a940775a47869bd2508a69f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 28 四月 2024 14:15:19 +0800
Subject: [PATCH] 用户功能完成

---
 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/userinfo/controller/SysUserController.java |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 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..727c0dc 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,14 @@
 package com.mes.userinfo.controller;
 
 
+import com.mes.base.BaseController;
 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.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -28,10 +28,7 @@
 @ApiModel("鐢ㄦ埛淇℃伅")
 @RestController
 @RequestMapping("/userinfo")
-public class SysUserController {
-
-    @Autowired
-    private SysUserService sysUserService;
+public class SysUserController extends BaseController {
 
     @ApiOperation("鐢ㄦ埛鐧诲綍")
     @PostMapping("/login")
@@ -47,28 +44,39 @@
 
     @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("/updateUser")
+//    @PreAuthorize("hasAuthority('sys:user:update')")
+    public Result<SysUserVO> updateUser(@Validated @RequestBody SysUserVO sysUser) {
+        return Result.success(sysUserService.updateUser(sysUser));
+    }
+
+    @PostMapping("/resetPassword")
+//    @PreAuthorize("hasAuthority('sys:user:resetPassword')")
+    public Result resetPassword(@RequestBody Long userId) {
+        return Result.success(sysUserService.resetPassword(userId));
+    }
+
+
     @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
     @PostMapping("/listByUserName")
+//    @PreAuthorize("hasAuthority('sys:user:list')")
     public Result<List<SysUserVO>> listByUserName(@RequestBody UserRequest request) {
         return Result.success(sysUserService.listByUserName(request));
     }
 
-    @ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
-    @PostMapping("/updateUser")
-    public Result<SysUserVO> updateUser(@RequestBody SysUserVO sysUser) {
-        return Result.success(sysUserService.updateUser(sysUser));
-    }
-
     @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