From 730443b70de88d328ffa275f51f69280fda979e4 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 30 八月 2023 12:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
index e0b0cc5..e795ff3 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
@@ -1,6 +1,8 @@
package com.yuanchu.limslaboratory.controller;
-import com.yuanchu.limslaboratory.annotation.RequestInfo;
+import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.dto.GetAllRoleAndMenuByConditionPageDto;
import com.yuanchu.limslaboratory.pojo.dto.RoleInfoDto;
import com.yuanchu.limslaboratory.pojo.dto.UpdateRoleMenuDto;
@@ -26,44 +28,57 @@
@ApiOperation("鑾峰彇鑿滃崟鍔熻兘鏍�")
@GetMapping("/getMenusTree")
- @RequestInfo(type = "add",name="ccc")
+ @AuthHandler
public Result<?>getMenusTree() {
return Result.success(roleManagerService.getMenusTree());
};
@ApiOperation("鏂板瑙掕壊")
@PostMapping("/addRoleInfo")
+ @AuthHandler
public Result<?>addRoleInfo(@RequestBody RoleInfoDto dto){
return Result.success(roleManagerService.addRoleInfo(dto));
}
@ApiOperation("鏌ヨ瑙掕壊鍚嶉噸澶�")
@GetMapping("/assertRepeat")
+ @AuthHandler
public Result<?> assertRepeat(String roleName){
return Result.success(roleManagerService.assertRepeat(roleName));
}
@ApiOperation("鑾峰彇瑙掕壊淇℃伅")
@GetMapping("/getAllRoleAndMenuInfo")
+ @AuthHandler
public Result<?> getAllRoleAndMenuInfo(GetAllRoleAndMenuByConditionPageDto dto){
return Result.success(roleManagerService.getAllRoleAndMenuInfo(dto));
}
@ApiOperation("閫昏緫鍒犻櫎瑙掕壊")
@GetMapping("/deleteRole")
+ @AuthHandler
public Result<?> deleteRole(Long id){
return Result.success(roleManagerService.deleteRole(id));
}
@ApiOperation("淇敼鏉冮檺")
@PostMapping("/updateRoleMenu")
+ @AuthHandler
public Result<?> updateRoleMenu(@RequestBody UpdateRoleMenuDto dto){
return Result.success(roleManagerService.updateRoleMenu(dto));
}
- @ApiOperation("/鏍规嵁瑙掕壊鑾峰彇Role")
+ @ApiOperation("鏍规嵁瑙掕壊Id鑾峰彇Role")
@GetMapping("/getRoleAndMenuByRole")
+ @AuthHandler
public Result<?> getRoleAndMenuByRole(Long roleId){
return Result.success(roleManagerService.getRoleAndMenuByRole(roleId));
}
+
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.role,isAdd = true)
+ @ApiOperation("娴嬭瘯鐢熸垚")
+ @GetMapping("/test")
+ public Result<?> test(Long roleId){
+ return Result.success(null);
+ }
}
--
Gitblit v1.9.3