From eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 11:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
index d60ec4e..69ea1fd 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleMangerController.java
@@ -1,12 +1,12 @@
package com.yuanchu.limslaboratory.controller;
+import com.yuanchu.limslaboratory.pojo.dto.GetAllRoleAndMenuByConditionPageDto;
+import com.yuanchu.limslaboratory.pojo.dto.RoleInfoDto;
import com.yuanchu.limslaboratory.service.RoleManagerService;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -28,6 +28,21 @@
return Result.success(roleManagerService.getMenusTree());
};
+ @ApiOperation("鏂板瑙掕壊")
+ @PostMapping("/addRoleInfo")
+ public Result<?>addRoleInfo(@RequestBody RoleInfoDto dto){
+ return Result.success(roleManagerService.addRoleInfo(dto));
+ }
+ @ApiOperation("鏌ヨ瑙掕壊鍚嶉噸澶�")
+ @GetMapping("/assertRepeat")
+ public Result<?> assertRepeat(String roleName){
+ return Result.success(roleManagerService.assertRepeat(roleName));
+ }
+ @ApiOperation("鑾峰彇瑙掕壊淇℃伅")
+ @GetMapping("/getAllRoleAndMenuInfo")
+ public Result<?> getAllRoleAndMenuInfo(GetAllRoleAndMenuByConditionPageDto dto){
+ return Result.success(roleManagerService.getAllRoleAndMenuInfo(dto));
+ }
}
--
Gitblit v1.9.3