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 |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 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 28f1e95..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;
 
@@ -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