From 2ae1a241de38fe31e6f341608613eac565fe97e8 Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Wed, 31 Oct 2018 16:50:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/MenusController.cs        | 21 +++++++++++--------
 Bootstrap.DataAccess.MongoDB/Menu.cs          | 19 +++++++++++++++++
 Bootstrap.DataAccess/Helper/MenuHelper.cs     |  4 ++--
 Bootstrap.DataAccess/Menu.cs                  |  4 ++--
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Bootstrap.Admin/Controllers/Api/MenusController.cs b/Bootstrap.Admin/Controllers/Api/MenusController.cs
index 7d73b890..46391284 100644
--- a/Bootstrap.Admin/Controllers/Api/MenusController.cs
+++ b/Bootstrap.Admin/Controllers/Api/MenusController.cs
@@ -4,7 +4,6 @@ using Bootstrap.Security;
 using Longbow.Web.Mvc;
 using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Bootstrap.Admin.Controllers.Api
 {
@@ -24,6 +23,7 @@ namespace Bootstrap.Admin.Controllers.Api
         {
             return value.RetrieveData(User.Identity.Name);
         }
+
         /// <summary>
         /// 保存菜单调用
         /// </summary>
@@ -33,6 +33,7 @@ namespace Bootstrap.Admin.Controllers.Api
         {
             return MenuHelper.SaveMenu(value);
         }
+
         /// <summary>
         /// 删除菜单调用
         /// </summary>
@@ -42,31 +43,33 @@ namespace Bootstrap.Admin.Controllers.Api
         {
             return MenuHelper.DeleteMenu(value);
         }
+
         /// <summary>
-        /// 
+        /// 角色管理菜单授权按钮调用
         /// </summary>
-        /// <param name="id"></param>
-        /// <param name="type"></param>
+        /// <param name="id">角色ID</param>
+        /// <param name="type">type=role时，角色管理菜单授权调用；type=user时，菜单管理编辑页面父类菜单按钮调用</param>
         /// <returns></returns>
         [HttpPost("{id}")]
-        public IEnumerable<BootstrapMenu> Post(string id, [FromQuery]string type)
+        public IEnumerable<object> Post(string id, [FromQuery]string type)
         {
-            var ret = new List<BootstrapMenu>();
+            IEnumerable<object> ret = new List<object>();
             switch (type)
             {
                 case "role":
-                    ret = MenuHelper.RetrieveMenusByRoleId(id).ToList();
+                    ret = MenuHelper.RetrieveMenusByRoleId(id);
                     break;
                 case "user":
-                    ret = MenuHelper.RetrieveMenus(User.Identity.Name).ToList();
+                    ret = MenuHelper.RetrieveMenus(User.Identity.Name);
                     break;
                 default:
                     break;
             }
             return ret;
         }
+
         /// <summary>
-        /// 角色管理页面分配菜单时调用
+        /// 角色管理菜单授权保存按钮调用
         /// </summary>
         /// <param name="id">角色ID</param>
         /// <param name="value">菜单ID集合</param>
diff --git a/Bootstrap.DataAccess.MongoDB/Menu.cs b/Bootstrap.DataAccess.MongoDB/Menu.cs
index d6a53a69..86d4ede7 100644
--- a/Bootstrap.DataAccess.MongoDB/Menu.cs
+++ b/Bootstrap.DataAccess.MongoDB/Menu.cs
@@ -72,5 +72,24 @@ namespace Bootstrap.DataAccess.MongoDB
             MongoDbAccessManager.Menus.BulkWrite(list);
             return true;
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <returns></returns>
+        public override IEnumerable<object> RetrieveMenusByRoleId(string roleId) => MongoDbAccessManager.Roles.Find(md => md.Id == roleId).FirstOrDefault().Menus.Select(m => new { Id = m });
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="roleId"></param>
+        /// <param name="menuIds"></param>
+        /// <returns></returns>
+        public override bool SaveMenusByRoleId(string roleId, IEnumerable<string> menuIds)
+        {
+            MongoDbAccessManager.Roles.FindOneAndUpdate(md => md.Id == roleId, Builders<Role>.Update.Set(md => md.Menus, menuIds));
+            return true;
+        }
     }
 }
diff --git a/Bootstrap.DataAccess/Helper/MenuHelper.cs b/Bootstrap.DataAccess/Helper/MenuHelper.cs
index 6e290ae8..fabc96d8 100644
--- a/Bootstrap.DataAccess/Helper/MenuHelper.cs
+++ b/Bootstrap.DataAccess/Helper/MenuHelper.cs
@@ -58,7 +58,7 @@ namespace Bootstrap.DataAccess
         /// </summary>
         /// <param name="roleId"></param>
         /// <returns></returns>
-        public static IEnumerable<BootstrapMenu> RetrieveMenusByRoleId(string roleId) => CacheManager.GetOrAdd($"{RetrieveMenusByRoleIdDataKey}-{roleId}", k => DbAdapterManager.Create<Menu>().RetrieveMenusByRoleId(roleId), RetrieveMenusByRoleIdDataKey);
+        public static IEnumerable<object> RetrieveMenusByRoleId(string roleId) => CacheManager.GetOrAdd($"{RetrieveMenusByRoleIdDataKey}-{roleId}", k => DbAdapterManager.Create<Menu>().RetrieveMenusByRoleId(roleId), RetrieveMenusByRoleIdDataKey);
 
         /// <summary>
         /// 
@@ -111,7 +111,7 @@ namespace Bootstrap.DataAccess
         /// </summary>
         /// <param name="userName"></param>
         /// <returns></returns>
-        public static IEnumerable<BootstrapMenu> RetrieveMenus(string userName)
+        public static IEnumerable<object> RetrieveMenus(string userName)
         {
             var menus = RetrieveAllMenus(userName);
             var root = menus.Where(m => m.ParentId == "0").OrderBy(m => m.ApplicationCode).ThenBy(m => m.Order);
diff --git a/Bootstrap.DataAccess/Menu.cs b/Bootstrap.DataAccess/Menu.cs
index c52ee502..38c32233 100644
--- a/Bootstrap.DataAccess/Menu.cs
+++ b/Bootstrap.DataAccess/Menu.cs
@@ -66,7 +66,7 @@ namespace Bootstrap.DataAccess
         /// </summary>
         /// <param name="roleId"></param>
         /// <returns></returns>
-        public virtual IEnumerable<BootstrapMenu> RetrieveMenusByRoleId(string roleId)
+        public virtual IEnumerable<object> RetrieveMenusByRoleId(string roleId)
         {
             var menus = new List<BootstrapMenu>();
             string sql = "select NavigationID from NavigationRole where RoleID = @RoleID";
@@ -84,7 +84,7 @@ namespace Bootstrap.DataAccess
                     }
                 }
             }
-            return menus;
+            return menus.Select(m => m.Id);
         }
         /// <summary>
         /// 通过角色ID保存当前授权菜单