From 5b9041d6ed80ab28ed56d62e5806bd36c7f80d9a Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 16 Jul 2019 10:07:08 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/MenuController.java     | 20 ++++++++++++++++---
 .../springblade/system/mapper/MenuMapper.java |  3 ++-
 .../springblade/system/mapper/MenuMapper.xml  | 15 ++++++++++----
 .../system/service/IMenuService.java          |  3 ++-
 .../system/service/impl/MenuServiceImpl.java  |  4 ++--
 5 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
index 840fcfab..acee4c24 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java
@@ -27,7 +27,9 @@ import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.Menu;
+import org.springblade.system.entity.TopMenu;
 import org.springblade.system.service.IMenuService;
+import org.springblade.system.service.ITopMenuService;
 import org.springblade.system.vo.CheckedTreeVO;
 import org.springblade.system.vo.GrantTreeVO;
 import org.springblade.system.vo.MenuVO;
@@ -55,6 +57,7 @@ import static org.springblade.core.cache.constant.CacheConstant.MENU_CACHE;
 public class MenuController extends BladeController {
 
 	private IMenuService menuService;
+	private ITopMenuService topMenuService;
 
 	/**
 	 * 详情
@@ -131,8 +134,8 @@ public class MenuController extends BladeController {
 	@GetMapping("/routes")
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
-	public R<List<MenuVO>> routes(BladeUser user) {
-		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId());
+	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
 		return R.data(list);
 	}
 
@@ -210,11 +213,22 @@ public class MenuController extends BladeController {
 		return R.data(vo);
 	}
 
+	/**
+	 * 顶部菜单数据
+	 */
+	@GetMapping("/top-menu")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "顶部菜单数据", notes = "顶部菜单数据")
+	public R<List<TopMenu>> topMenu() {
+		List<TopMenu> list = topMenuService.list();
+		return R.data(list);
+	}
+
 	/**
 	 * 获取配置的角色权限
 	 */
 	@GetMapping("auth-routes")
-	@ApiOperationSupport(order = 12)
+	@ApiOperationSupport(order = 13)
 	@ApiOperation(value = "菜单的角色权限")
 	public R<List<Kv>> authRoutes(BladeUser user) {
 		if (Func.isEmpty(user)) {
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
index d3b6eee5..7fc89e2e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
@@ -119,9 +119,10 @@ public interface MenuMapper extends BaseMapper<Menu> {
 	 * 权限配置菜单
 	 *
 	 * @param roleId
+	 * @param topMenuId
 	 * @return
 	 */
-	List<Menu> roleMenu(List<Long> roleId);
+	List<Menu> roleMenu(List<Long> roleId, Long topMenuId);
 
 	/**
 	 * 菜单树形结构
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
index 295baefd..4cfecfcf 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml
@@ -40,12 +40,19 @@
     </select>
 
     <select id="roleMenu" resultMap="menuResultMap">
-        select * from blade_menu where is_deleted = 0 and id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
-        <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+        select * from blade_menu where is_deleted = 0 and id IN
+        ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+        <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
             #{item}
-        </foreach> )
+        </foreach>
+        )
+        <if test="param2!=null and param2>0">
+            AND id IN
+            (
+            SELECT menu_id FROM blade_top_menu_setting WHERE top_menu_id = #{param2}
+            )
+        </if>
     </select>
-
     <select id="routes" resultMap="menuResultMap">
         SELECT
             *
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java
index 1f61cf10..98c7f5f2 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IMenuService.java
@@ -45,9 +45,10 @@ public interface IMenuService extends IService<Menu> {
 	 * 菜单树形结构
 	 *
 	 * @param roleId
+	 * @param topMenuId
 	 * @return
 	 */
-	List<MenuVO> routes(String roleId);
+	List<MenuVO> routes(String roleId, Long topMenuId);
 
 	/**
 	 * 按钮树形结构
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
index d94fb86d..a725330a 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
@@ -66,12 +66,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
 	}
 
 	@Override
-	public List<MenuVO> routes(String roleId) {
+	public List<MenuVO> routes(String roleId, Long topMenuId) {
 		if (StringUtil.isBlank(roleId)) {
 			return null;
 		}
 		List<Menu> allMenus = baseMapper.allMenu();
-		List<Menu> roleMenus = baseMapper.roleMenu(Func.toLongList(roleId));
+		List<Menu> roleMenus = baseMapper.roleMenu(Func.toLongList(roleId), topMenuId);
 		return buildRoutes(allMenus, roleMenus);
 	}