From 93e281b3cc60c8d24a0ed5547d3d399c03f9bab6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Jun 2022 18:03:52 +0800
Subject: [PATCH] 20220606

---
 src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
index 2b04b81..45cd6ac 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/Controller/AdminUserController.java
@@ -1,9 +1,7 @@
 package com.xcong.farmer.cms.modules.system.Controller;
 
 import com.xcong.farmer.cms.common.response.Result;
-import com.xcong.farmer.cms.modules.system.dto.AdminAddUserDto;
-import com.xcong.farmer.cms.modules.system.dto.AdminUpdateUserDto;
-import com.xcong.farmer.cms.modules.system.dto.AdminUserDto;
+import com.xcong.farmer.cms.modules.system.dto.*;
 import com.xcong.farmer.cms.modules.system.service.IUserService;
 import com.xcong.farmer.cms.modules.system.vo.AdminUserVo;
 import com.xcong.farmer.cms.modules.test.dto.TestUserDto;
@@ -21,7 +19,7 @@
 import javax.validation.Valid;
 
 @RestController
-@RequestMapping(value = "/user")
+@RequestMapping(value = "/api/user")
 @Slf4j
 @Api(value = "系统用户", tags = "系统用户")
 public class AdminUserController {
@@ -33,7 +31,6 @@
     @ApiResponses({@ApiResponse(code = 200, message = "ok", response = AdminUserVo.class)})
     @PostMapping(value = "/userInPage")
     public Result getUserInPage(@RequestBody @Valid AdminUserDto adminUserDto) {
-        log.info("--->{}", SecurityContextHolder.getContext().getAuthentication());
         return iUserService.getUserInPage(adminUserDto);
     }
 
@@ -67,16 +64,40 @@
         return iUserService.seeUserInfo(id);
     }
 
+    @ApiOperation(value = "个人中心", notes = "个人中心")
+    @GetMapping(value = "/userInfo")
+    public Result userInfo() {
+        return iUserService.userInfo();
+    }
+
     @ApiOperation(value = "更新系统用户", notes = "更新系统用户")
     @PostMapping(value = "/updateUser")
     public Result updateUser(@RequestBody @Valid AdminUpdateUserDto adminUpdateUserDto) {
         return iUserService.updateUser(adminUpdateUserDto);
     }
 
+    @ApiOperation(value = "修改密码", notes = "修改密码")
+    @PostMapping(value = "/updatePassword")
+    public Result updatePassword(@RequestBody @Valid AdminUpdatePasswordDto adminUpdatePasswordDto) {
+        return iUserService.updatePassword(adminUpdatePasswordDto);
+    }
+
     @ApiOperation(value = "重置密码", notes = "重置密码")
     @GetMapping(value = "/resetPassword/{id}")
     public Result resetPassword(@PathVariable(value = "id") Long id) {
         return iUserService.resetPassword(id);
     }
 
+    @ApiOperation(value = "查看用户的全部菜单", notes = "查看用户的全部菜单")
+    @GetMapping(value = "/userMenu")
+    public Result userMenu() {
+        return iUserService.userMenu();
+    }
+
+    @ApiOperation(value = "删除系统用户", notes = "删除系统用户")
+    @PostMapping(value = "/delObjs")
+    public Result delObjs(@RequestBody @Valid AdminDeleteDto adminDeleteDto) {
+        return iUserService.delObjs(adminDeleteDto);
+    }
+
 }

--
Gitblit v1.9.1