diff --git a/Bootstrap.Admin/Bootstrap.Admin.csproj b/Bootstrap.Admin/Bootstrap.Admin.csproj index 60912a61..993dfbaf 100644 --- a/Bootstrap.Admin/Bootstrap.Admin.csproj +++ b/Bootstrap.Admin/Bootstrap.Admin.csproj @@ -264,6 +264,7 @@ + diff --git a/Bootstrap.Admin/Content/js/framework.js b/Bootstrap.Admin/Content/js/framework.js index 932e78c2..aea0d9b5 100644 --- a/Bootstrap.Admin/Content/js/framework.js +++ b/Bootstrap.Admin/Content/js/framework.js @@ -310,4 +310,19 @@ Group.saveGroupsByRoleId = function (roleId, groupIds, callback) { processData.call(this, { Id: roleId, callback: callback, method: "PUT", data: { type: "role", groupIds: groupIds } }); }; + htmlTemplateForMenu='
    • '; + //Menus + Menu = { + url: '../api/Menus/', title: "授权菜单", html: function (result) { + return $.map(result, function (element, index) { + return $.format(htmlTemplateForMenu, element.ID, element.Name, element.Active); + }).join(''); + } + } + Menu.getMenusByRoleId = function (roleId, callback) { + processData.call(this, { Id: roleId, callback: callback, data: { type: "role" } }); + }; + Menu.saveMenusByRoleId = function (roleId, menuIds, callback) { + processData.call(this, { Id: roleId, callback: callback, method: "PUT", data: { type: "role", menuIds:menuIds } }); + }; })(jQuery); \ No newline at end of file diff --git a/Bootstrap.Admin/Controllers/GroupsController.cs b/Bootstrap.Admin/Controllers/GroupsController.cs index 54e9e1c7..298c9d47 100644 --- a/Bootstrap.Admin/Controllers/GroupsController.cs +++ b/Bootstrap.Admin/Controllers/GroupsController.cs @@ -7,94 +7,94 @@ using System.Web.Http; namespace Bootstrap.Admin.Controllers { - public class GroupsController : ApiController - { - /// - /// - /// - /// - /// - [HttpGet] - public QueryData Get([FromUri]QueryGroupOption value) - { - return value.RetrieveData(); - } - /// - /// - /// - /// - /// - [HttpGet] - public Group Get(int id) - { - return GroupHelper.RetrieveGroups().FirstOrDefault(t => t.ID == id); - } - /// - /// - /// - /// - [HttpPost] - public bool Post([FromBody]Group value) - { - return GroupHelper.SaveGroup(value); - } - /// - /// - /// - /// - [HttpDelete] - public bool Delete([FromBody]string value) - { - return GroupHelper.DeleteGroup(value); - } - /// - /// - /// - /// - /// - /// - [HttpPost] - public IEnumerable Post(int id, [FromBody]JObject value) - { - var ret = new List(); - dynamic json = value; - switch ((string)json.type) - { - case "user": - ret = GroupHelper.RetrieveGroupsByUserId(id).ToList(); - break; + public class GroupsController : ApiController + { + /// + /// + /// + /// + /// + [HttpGet] + public QueryData Get([FromUri]QueryGroupOption value) + { + return value.RetrieveData(); + } + /// + /// + /// + /// + /// + [HttpGet] + public Group Get(int id) + { + return GroupHelper.RetrieveGroups().FirstOrDefault(t => t.ID == id); + } + /// + /// + /// + /// + [HttpPost] + public bool Post([FromBody]Group value) + { + return GroupHelper.SaveGroup(value); + } + /// + /// + /// + /// + [HttpDelete] + public bool Delete([FromBody]string value) + { + return GroupHelper.DeleteGroup(value); + } + /// + /// + /// + /// + /// + /// + [HttpPost] + public IEnumerable Post(int id, [FromBody]JObject value) + { + var ret = new List(); + dynamic json = value; + switch ((string)json.type) + { + case "user": + ret = GroupHelper.RetrieveGroupsByUserId(id).ToList(); + break; case "role": - ret = GroupHelper.RetrieveGroupsByRoleId(id).ToList(); - break; - default: - break; - } - return ret; - } - /// - /// - /// - /// - /// - /// - [HttpPut] - public bool Put(int id, [FromBody]JObject value) - { - var ret = false; - dynamic json = value; - string groupIds = json.groupIds; - switch ((string)json.type) - { - case "user": - ret = GroupHelper.SaveGroupsByUserId(id, groupIds); - break; + ret = GroupHelper.RetrieveGroupsByRoleId(id).ToList(); + break; + default: + break; + } + return ret; + } + /// + /// + /// + /// + /// + /// + [HttpPut] + public bool Put(int id, [FromBody]JObject value) + { + var ret = false; + dynamic json = value; + string groupIds = json.groupIds; + switch ((string)json.type) + { + case "user": + ret = GroupHelper.SaveGroupsByUserId(id, groupIds); + break; case "role": - ret = GroupHelper.SaveGroupsByRoleId(id, groupIds); - break; - default: - break; - } - return ret; - } - } + ret = GroupHelper.SaveGroupsByRoleId(id, groupIds); + break; + default: + break; + } + return ret; + } + } } diff --git a/Bootstrap.Admin/Controllers/MenusController.cs b/Bootstrap.Admin/Controllers/MenusController.cs index 02050b38..ea3e39e5 100644 --- a/Bootstrap.Admin/Controllers/MenusController.cs +++ b/Bootstrap.Admin/Controllers/MenusController.cs @@ -1,5 +1,8 @@ using Bootstrap.Admin.Models; using Bootstrap.DataAccess; +using Newtonsoft.Json.Linq; +using System.Collections.Generic; +using System.Linq; using System.Web.Http; namespace Bootstrap.Admin.Controllers @@ -34,5 +37,36 @@ namespace Bootstrap.Admin.Controllers { return MenuHelper.DeleteMenu(value); } + [HttpPost] + public IEnumerable Post(int id, [FromBody]JObject value) + { + var ret = new List(); + dynamic json = value; + switch ((string)json.type) + { + case "role": + ret = MenuHelper.RetrieveMenusByRoleId(id).ToList(); + break; + default: + break; + } + return ret; + } + [HttpPut] + public bool Put(int id, [FromBody]JObject value) + { + var ret = false; + dynamic json = value; + string menuIds = json.menuIds.ToString(); + switch ((string)json.type) + { + case "role": + ret = MenuHelper.SaveMenusByRoleId(id, menuIds); + break; + default: + break; + } + return ret; + } } } \ No newline at end of file diff --git a/Bootstrap.Admin/Models/QueryGroupOption.cs b/Bootstrap.Admin/Models/QueryGroupOption.cs index 75285939..ab60e419 100644 --- a/Bootstrap.Admin/Models/QueryGroupOption.cs +++ b/Bootstrap.Admin/Models/QueryGroupOption.cs @@ -32,7 +32,6 @@ namespace Bootstrap.Admin.Models } var ret = new QueryData(); ret.total = data.Count(); - // TODO: 通过option.Sort属性判断对那列进行排序，现在统一对名称列排序 data = Order == "asc" ? data.OrderBy(t => t.GroupName) : data.OrderByDescending(t => t.GroupName); ret.rows = data.Skip(Offset).Take(Limit); return ret; diff --git a/Bootstrap.Admin/Models/QueryRoleOption.cs b/Bootstrap.Admin/Models/QueryRoleOption.cs index dea041db..4838a2b8 100644 --- a/Bootstrap.Admin/Models/QueryRoleOption.cs +++ b/Bootstrap.Admin/Models/QueryRoleOption.cs @@ -32,7 +32,6 @@ namespace Bootstrap.Admin.Models } var ret = new QueryData(); ret.total = data.Count(); - // TODO: 通过option.Sort属性判断对那列进行排序，现在统一对名称列排序 data = Order == "asc" ? data.OrderBy(t => t.RoleName) : data.OrderByDescending(t => t.RoleName); ret.rows = data.Skip(Offset).Take(Limit); return ret; diff --git a/Bootstrap.Admin/Models/QueryUserOption.cs b/Bootstrap.Admin/Models/QueryUserOption.cs index e9ac0d4e..dc9a226f 100644 --- a/Bootstrap.Admin/Models/QueryUserOption.cs +++ b/Bootstrap.Admin/Models/QueryUserOption.cs @@ -32,8 +32,17 @@ namespace Bootstrap.Admin.Models } var ret = new QueryData(); ret.total = data.Count(); - // TODO: 通过option.Sort属性判断对那列进行排序，现在统一对名称列排序 - data = Order == "asc" ? data.OrderBy(t => t.UserName) : data.OrderByDescending(t => t.UserName); + switch (Sort) + { + case "UserName": + data = Order == "asc" ? data.OrderBy(t => t.UserName) : data.OrderByDescending(t => t.UserName); + break; + case "RegisterTime": + data = Order == "asc" ? data.OrderBy(t => t.RegisterTime) : data.OrderByDescending(t => t.RegisterTime); + break; + default: + break; + } ret.rows = data.Skip(Offset).Take(Limit); return ret; } diff --git a/Bootstrap.Admin/Scripts/Roles.js b/Bootstrap.Admin/Scripts/Roles.js index 2c152f82..e0832f91 100644 --- a/Bootstrap.Admin/Scripts/Roles.js +++ b/Bootstrap.Admin/Scripts/Roles.js @@ -44,14 +44,45 @@ var groupIds = $('#dialogGroup :checked').map(function (index, element) { return $(element).val(); }).toArray().join(','); - Group.saveGroupsByRoleId(roleId, groupIds, { modal: 'dialogGroup' }); - - + Group.saveGroupsByRoleId(roleId, groupIds, { modal: 'dialogGroup' }); + } + }, + { + id: 'btn_assignMenu', + click: function (row) { + Menu.getMenusByRoleId(row.ID, function (data) { + $(".menu-content .modal-header .modal-title").text($.format('{0}-菜单授权窗口', row.RoleName)); + $('.menu-content button:last').data('type', 'menu'); + $('ol.dd-list').html(data); + $('#dialogMenu').modal('show'); + $('.menu-content').show(); + $('div.dd3-content :checkbox').show(); + $('div.dd3-content :radio').hide(); + }) + } + }, + { + id: 'btnSubmitMenu', + click: function (row) { + var roleId = row.ID; + var type = $('.menu-content button:last').data('type'); + switch (type) { + case "menu": + var menuIds = $('.dd3-content :checkbox:checked').map(function (index, element) { + return $(element).val(); + }).toArray().join(','); + break; + default: + break; + } + Menu.saveMenusByRoleId(roleId, menuIds, { modal: 'dialogMenu' }); } }] } }); + $('#nestable_menu').nestable(); + $('table').smartTable({ url: '../api/Roles', //请求后台的URL（*） sortName: 'RoleName', diff --git a/Bootstrap.Admin/Views/Admin/Roles.cshtml b/Bootstrap.Admin/Views/Admin/Roles.cshtml index 5fece261..485ff0a5 100644 --- a/Bootstrap.Admin/Views/Admin/Roles.cshtml +++ b/Bootstrap.Admin/Views/Admin/Roles.cshtml @@ -3,8 +3,14 @@ ViewBag.Title = "角色管理"; Layout = "~/Views/Shared/_Default.cshtml"; } +@section css { + + +} @section Javascript { + + } @section header { @Html.Partial("Header", Model) @@ -34,6 +40,9 @@ + } @section modal {
    @@ -57,4 +66,5 @@ @section customModal{ @Html.Partial("UserConfig") @Html.Partial("GroupConfig") + @Html.Partial("NavigatorConfig", Model.Navigations) } diff --git a/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml b/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml new file mode 100644 index 00000000..a2b1ba4a --- /dev/null +++ b/Bootstrap.Admin/Views/Shared/NavigatorConfig.cshtml @@ -0,0 +1,7 @@ +@model IEnumerable + + diff --git a/Bootstrap.Admin/Web.config b/Bootstrap.Admin/Web.config index 45aaeac9..c80738e0 100644 --- a/Bootstrap.Admin/Web.config +++ b/Bootstrap.Admin/Web.config @@ -25,6 +25,7 @@ + diff --git a/Bootstrap.DataAccess/MenuHelper.cs b/Bootstrap.DataAccess/MenuHelper.cs index 53082ed7..04fc9ed1 100644 --- a/Bootstrap.DataAccess/MenuHelper.cs +++ b/Bootstrap.DataAccess/MenuHelper.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.Common; +using System.Data.SqlClient; using System.Globalization; using System.Linq; @@ -16,6 +17,7 @@ namespace Bootstrap.DataAccess { internal const string RetrieveMenusDataKey = "MenuHelper-RetrieveMenus"; internal const string RetrieveMenusByUserIDDataKey = "MenuHelper-RetrieveMenusByUserId"; + internal const string RetrieveMenusByRoleIDDataKey = "MenuHelper-RetrieveMenusByRoleId"; /// /// 查询所有菜单信息 /// @@ -184,5 +186,88 @@ namespace Bootstrap.DataAccess } return ret; } + + /// + /// 查询某个角色所配置的菜单 + /// + /// + /// + public static IEnumerable RetrieveMenusByRoleId(int roleId) + { + string key = string.Format("{0}-{1}", RetrieveMenusByRoleIDDataKey, roleId); + return CacheManager.GetOrAdd(key, CacheSection.RetrieveIntervalByKey(RetrieveMenusByRoleIDDataKey), k => + { + List Menus = new List(); + string sql = "select n.ID,n.ParentId, n.Name,n.[Order],n.Icon,n.Url,n.Category, case nr.NavigationID when n.ID then 'active' else '' end [status] from Navigations n left join NavigationRole nr on n.ID = nr.NavigationID and RoleID = @RoleID"; + DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql); + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@RoleID", roleId, ParameterDirection.Input)); + try + { + using (DbDataReader reader = DBAccessManager.SqlDBAccess.ExecuteReader(cmd)) + { + while (reader.Read()) + { + Menus.Add(new Menu() + { + ID = (int)reader[0], + ParentId = (int)reader[1], + Name = (string)reader[2], + Order = (int)reader[3], + Icon = LgbConvert.ReadValue(reader[4], string.Empty), + Url = LgbConvert.ReadValue(reader[5], string.Empty), + Category = (string)reader[6], + Active = (string)reader[7] == "" ? "" : "checked" + }); + } + } + } + catch (Exception ex) { ExceptionManager.Publish(ex); } + return Menus; + }, CacheSection.RetrieveDescByKey(RetrieveMenusByRoleIDDataKey)); + } + /// + /// 通过角色ID保存当前授权菜单 + /// + /// + /// + /// + public static bool SaveMenusByRoleId(int id, string menuIds) + { + bool ret = false; + DataTable dt = new DataTable(); + dt.Columns.Add("RoleID", typeof(int)); + dt.Columns.Add("NavigationID", typeof(int)); + if (!string.IsNullOrEmpty(menuIds)) menuIds.Split(',').ToList().ForEach(menuId => dt.Rows.Add(id, Convert.ToInt32(menuId))); + using (TransactionPackage transaction = DBAccessManager.SqlDBAccess.BeginTransaction()) + { + try + { + //删除菜单角色表该角色所有的菜单 + string sql = "delete from NavigationRole where RoleID=@RoleID"; + using (DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql)) + { + cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@RoleID", id, ParameterDirection.Input)); + DBAccessManager.SqlDBAccess.ExecuteNonQuery(cmd, transaction); + //批插入菜单角色表 + using (SqlBulkCopy bulk = new SqlBulkCopy((SqlConnection)transaction.Transaction.Connection, SqlBulkCopyOptions.Default, (SqlTransaction)transaction.Transaction)) + { + bulk.DestinationTableName = "NavigationRole"; + bulk.ColumnMappings.Add("RoleID", "RoleID"); + bulk.ColumnMappings.Add("NavigationID", "NavigationID"); + bulk.WriteToServer(dt); + transaction.CommitTransaction(); + } + } + CacheCleanUtility.ClearCache(menuIds: menuIds, roleIds: id.ToString()); + ret = true; + } + catch (Exception ex) + { + ExceptionManager.Publish(ex); + transaction.RollbackTransaction(); + } + } + return ret; + } } } diff --git a/Bootstrap.DataAccessTests/MenuHelperTests.cs b/Bootstrap.DataAccessTests/MenuHelperTests.cs index b8f2af9c..abbb58c1 100644 --- a/Bootstrap.DataAccessTests/MenuHelperTests.cs +++ b/Bootstrap.DataAccessTests/MenuHelperTests.cs @@ -37,6 +37,11 @@ namespace Bootstrap.DataAccess.Tests { Assert.IsTrue(MenuHelper.RetrieveMenusByUserId(1).Count() > 1, "根据用户ID查询菜单的MenuHelper.RetrieveMenusByUserId方法调用失败"); } + [TestMethod] + public void RetrieveMenuByRoleIDTest() + { + Assert.IsTrue(MenuHelper.RetrieveMenusByRoleId(1).Count() >= 0, "根据角色ID查询菜单的MenuHelper.RetrieveMenusByRoleId方法调用失败"); + } [TestMethod] public void SaveMenuTest() @@ -85,5 +90,28 @@ namespace Bootstrap.DataAccess.Tests DBAccessManager.SqlDBAccess.ExecuteNonQuery(cmd); } } + [TestMethod] + public void SaveMenusByRoleIdTest() + { + var menu = MenuHelper.RetrieveMenus().FirstOrDefault(m => m.Name == Menu.Name); + if (menu == null) MenuHelper.SaveMenu(Menu); + menu = MenuHelper.RetrieveMenus().FirstOrDefault(m => m.Name == Menu.Name); + var role = RoleHelper.RetrieveRoles().FirstOrDefault(r => r.RoleName == Role.RoleName); + if (role == null) RoleHelper.SaveRole(Role); + role = RoleHelper.RetrieveRoles().FirstOrDefault(r => r.RoleName == Role.RoleName); + + Assert.IsTrue(MenuHelper.SaveMenusByRoleId(role.ID, menu.ID.ToString()), "存储角色菜单信息失败"); + int x = MenuHelper.RetrieveMenusByRoleId(role.ID).Count(); + Assert.IsTrue(x >= 1, string.Format("获取角色ID={0}的菜单信息失败", role.ID)); + + //删除数据 + string sql = "Delete from Navigations where Name = '__测试菜单__';"; + sql += "Delete from Roles where RoleName='_测试角色_';"; + sql += string.Format("Delete from NavigationRole where RoleID={0};", role.ID); + using (DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql)) + { + DBAccessManager.SqlDBAccess.ExecuteNonQuery(cmd); + } + } } }