From 6984757bfc75b4a25014de1eb71c2aa75ebdb86f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:59:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
similarity index 66%
rename from laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
index 69ea1fd..e0b0cc5 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
@@ -1,7 +1,9 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.annotation.RequestInfo;
import com.yuanchu.limslaboratory.pojo.dto.GetAllRoleAndMenuByConditionPageDto;
import com.yuanchu.limslaboratory.pojo.dto.RoleInfoDto;
+import com.yuanchu.limslaboratory.pojo.dto.UpdateRoleMenuDto;
import com.yuanchu.limslaboratory.service.RoleManagerService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
@@ -24,6 +26,7 @@
@ApiOperation("鑾峰彇鑿滃崟鍔熻兘鏍�")
@GetMapping("/getMenusTree")
+ @RequestInfo(type = "add",name="ccc")
public Result<?>getMenusTree() {
return Result.success(roleManagerService.getMenusTree());
};
@@ -45,4 +48,22 @@
public Result<?> getAllRoleAndMenuInfo(GetAllRoleAndMenuByConditionPageDto dto){
return Result.success(roleManagerService.getAllRoleAndMenuInfo(dto));
}
+
+ @ApiOperation("閫昏緫鍒犻櫎瑙掕壊")
+ @GetMapping("/deleteRole")
+ public Result<?> deleteRole(Long id){
+ return Result.success(roleManagerService.deleteRole(id));
+ }
+
+ @ApiOperation("淇敼鏉冮檺")
+ @PostMapping("/updateRoleMenu")
+ public Result<?> updateRoleMenu(@RequestBody UpdateRoleMenuDto dto){
+ return Result.success(roleManagerService.updateRoleMenu(dto));
+ }
+
+ @ApiOperation("/鏍规嵁瑙掕壊鑾峰彇Role")
+ @GetMapping("/getRoleAndMenuByRole")
+ public Result<?> getRoleAndMenuByRole(Long roleId){
+ return Result.success(roleManagerService.getRoleAndMenuByRole(roleId));
+ }
}
--
Gitblit v1.9.3