From 8d637e54a1104e8e47093aef2fb2006e7f6533c6 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 05 Jun 2023 21:26:19 +0800
Subject: [PATCH] 增加新菜单配置
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
index dfe346e..987b52e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
@@ -16,7 +16,7 @@
*/
package cn.gistack.system.controller;
-import cn.gistack.system.vo.GrantTreeVO;
+import cn.gistack.system.vo.*;
import cn.gistack.system.wrapper.MenuWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -37,12 +37,11 @@
import cn.gistack.system.entity.TopMenu;
import cn.gistack.system.service.IMenuService;
import cn.gistack.system.service.ITopMenuService;
-import cn.gistack.system.vo.CheckedTreeVO;
-import cn.gistack.system.vo.MenuVO;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -68,7 +67,7 @@
* 详情
*/
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入menu")
public R<MenuVO> detail(Menu menu) {
@@ -84,7 +83,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "传入menu")
public R<List<MenuVO>> list(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -100,7 +99,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 3)
@ApiOperation(value = "懒加载列表", notes = "传入menu")
public R<List<MenuVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -116,7 +115,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 4)
@ApiOperation(value = "菜单列表", notes = "传入menu")
public R<List<MenuVO>> menuList(@ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -132,7 +131,7 @@
@ApiImplicitParam(name = "code", value = "菜单编号", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "name", value = "菜单名称", paramType = "query", dataType = "string")
})
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 5)
@ApiOperation(value = "懒加载菜单列表", notes = "传入menu")
public R<List<MenuVO>> lazyMenuList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
@@ -144,7 +143,7 @@
* 新增或修改
*/
@PostMapping("/submit")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入menu")
public R submit(@Valid @RequestBody Menu menu) {
@@ -163,7 +162,7 @@
* 删除
*/
@PostMapping("/remove")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
@ApiOperationSupport(order = 7)
@ApiOperation(value = "删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
@@ -184,6 +183,28 @@
}
/**
+ * 动态获取菜单数据
+ */
+ @GetMapping("/dynamicMenu")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "动态获取菜单数据", notes = "动态获取菜单数据")
+ public R dynamicMenu(String roleId,String flag){
+ if (flag.equals("web") || flag.equals("newWeb") ){
+ List<WebMenuVO> list = menuService.getWebMenu(roleId);
+ List<MenuVO> buttonList = menuService.getButtonList(roleId);
+ WebPermissionVO webPermissionVO = new WebPermissionVO();
+ webPermissionVO.setButtonList(buttonList);
+ webPermissionVO.setWebMenuList(list);
+ return R.data(webPermissionVO);
+ }
+ if (flag.equals("app")){
+ List<MenuVO> list = menuService.getAppMenu(roleId);
+ return R.data(list);
+ }
+ return R.data(null);
+ }
+
+ /**
* 前端按钮数据
*/
@GetMapping("/buttons")
--
Gitblit v1.9.3