From 1865de1cd0255f7c42a326018a8cc3b5a1ee5253 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 09:03:26 +0800
Subject: [PATCH] 权限

---
 user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index a01ef4c..6781bd3 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -3,8 +3,10 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
 import com.yuanchu.limslaboratory.clients.UserLoginUtils;
 import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.RoleManagerService;
 import com.yuanchu.limslaboratory.service.UserService;
 import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
 import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -24,6 +26,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -42,6 +45,9 @@
 
     @Autowired
     private UserService userService;
+
+    @Autowired
+    private RoleManagerService roleManagerService;
 
     @ApiOperation("鐢ㄦ埛鐧诲綍")
     @ApiImplicitParams(value = {
@@ -75,6 +81,14 @@
         }
     }
 
+    @ApiOperation("鏂板鐢ㄦ埛鑾峰彇瑙掕壊鏉冮檺淇℃伅")
+    @GetMapping("/list")
+    @AuthHandler
+    public Result<?> getUserListRole(){
+        List<Map<String,Object>> data = roleManagerService.getUserListRole();
+        return Result.success(data);
+    }
+
     @ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
     @GetMapping("/info")
     public Result<?> getUserInfo(@RequestHeader("X-Token") String token){
@@ -86,8 +100,15 @@
         return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
     }
 
+    @ApiOperation("鐧诲綍-->鑾峰彇瑙掕壊淇℃伅")
+    @GetMapping("/roleInfo")
+    public Result<?> getUserRoleInfo(@RequestHeader("X-Token") String token){
+        return Result.success(userService.getUserRoleInfo(token));
+    }
+
     @PostMapping("/getUserById")
     @ApiOperation("鑾峰彇鎸囧畾鐢ㄦ埛id鐨勭敤鎴蜂俊鎭拰浼佷笟淇℃伅")
+    @AuthHandler
     public Result<?> getUserById(@RequestHeader("X-Token") String token) throws Exception {
         Object o = RedisUtil.get(token);
         Map<String, Object> unmarshal = null;
@@ -101,6 +122,7 @@
 
     @PostMapping("/add_new_personnel")
     @ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠$悊-->鏂板浜哄憳")
+    @AuthHandler
     public Result<?> addNewPersonnel(@RequestHeader("X-Token") String token, @RequestBody NewPersonnelVo newPersonnelVo) throws Exception {
         Object redisUserMessage = RedisUtil.get(token);
         Map<String, Object> user = null;
@@ -119,6 +141,7 @@
 
     @PutMapping("/update_new_personnel")
     @ApiOperation("瀹為獙瀹ょ鐞�-->浜哄憳绠$悊-->缂栬緫鎿嶄綔")
+    @AuthHandler
     public Result<?> updateNewPersonnel(@RequestBody UpdatePersonnelVo updatePersonnelVo) {
         Integer isUpdateSuccess = userService.updateNewPersonnel(updatePersonnelVo);
         if (isUpdateSuccess == 1){
@@ -135,6 +158,7 @@
             @ApiImplicitParam(name = "name", value = "浜哄憳鍚嶇О", dataTypeClass = String.class),
             @ApiImplicitParam(name = "status", value = "鍦ㄨ亴鐘舵��", dataTypeClass = Integer.class)
     })
+    @AuthHandler
     public Result<Map<String, Object>> getNewPersonnelPage(Integer pageNo, Integer pageSize, String name, Integer status) {
         IPage<Map<String, Object>> PageList = userService.getNewPersonnelPage(name, new Page<Objects>(pageNo, pageSize), status);
         Map<String, Object> map = new HashMap<>();

--
Gitblit v1.9.3