完成用户模块/用户角色分配

2025-08-23 13:06:48 +08:00 · 2015-11-30 00:12:42 +08:00 · 2015-11-30 00:12:42 +08:00 · 92ead80909
commit 92ead80909
parent fda4186350
19 changed files with 297 additions and 68 deletions
--- a/OpenAuth.App/ModuleManagerApp.cs
+++ b/OpenAuth.App/ModuleManagerApp.cs
@ -114,6 +114,12 @@ namespace OpenAuth.App
            }
        }

+        public void AccessModules(int userId, int[] ids)
+        {
+            _userModuleRepository.DeleteByUser(userId);
+            _userModuleRepository.AddUserModule(userId, ids);
+        }
+
        #region 私有方法

        //根据同一级中最大的语义ID
--- a/OpenAuth.App/OpenAuth.App.csproj
+++ b/OpenAuth.App/OpenAuth.App.csproj
@ -50,6 +50,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="OrgManagerApp.cs" />
    <Compile Include="ViewModel\ModuleView.cs" />
+    <Compile Include="ViewModel\RoleVM.cs" />
    <Compile Include="ViewModel\UserView.cs" />
  </ItemGroup>
  <ItemGroup>
--- a/OpenAuth.App/RoleManagerApp.cs
+++ b/OpenAuth.App/RoleManagerApp.cs
@ -4,6 +4,7 @@ using OpenAuth.Domain.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Web.Security;

 namespace OpenAuth.App
 {
@ -11,12 +12,15 @@ namespace OpenAuth.App
    {
        private IRoleRepository _repository;
        private IOrgRepository _orgRepository;
+        private IUserRoleRepository _userRoleRepository;

        public RoleManagerApp(IRoleRepository repository,
-            IOrgRepository orgRepository)
+            IOrgRepository orgRepository,
+            IUserRoleRepository userRoleRepository)
        {
            _repository = repository;
            _orgRepository = orgRepository;
+            _userRoleRepository = userRoleRepository;
        }

        public int GetRoleCntInOrg(int orgId)
@ -45,12 +49,12 @@ namespace OpenAuth.App
            }
            else
            {
-                roles = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId));
+                roles = _repository.LoadInOrgs(pageindex, pagesize, GetSubOrgIds(orgId));
                total = _repository.GetRoleCntInOrgs(orgId);
            }
-           

-            return new 
+
+            return new
            {
                total = total,
                list = roles,
@ -70,8 +74,8 @@ namespace OpenAuth.App

        public Role Find(int id)
        {
-            var role =  _repository.FindSingle(u => u.Id == id);
-            if(role == null) role = new Role();
+            var role = _repository.FindSingle(u => u.Id == id);
+            if (role == null) role = new Role();
            return role;

        }
@ -95,6 +99,25 @@ namespace OpenAuth.App

        }

-       
+
+        public List<RoleVM> LoadWithUser(int userId)
+        {
+            var roleIds = _repository.Find(null).ToList();
+            var rolevms = new List<RoleVM>();
+            foreach (var role in roleIds)
+            {
+                RoleVM rolevm = role;
+                rolevm.IsBelongUser = (_userRoleRepository.FindSingle(u => u.RoleId == role.Id && u.UserId == userId) !=
+                                      null);
+                rolevms.Add(rolevm);
+            }
+            return rolevms;
+        }
+
+        public void AccessRole(int userId, int[] roleIds)
+        {
+            _userRoleRepository.DeleteByUser(userId);
+           _userRoleRepository.AddUserRole(userId, roleIds);
+        }
    }
 }
--- a/OpenAuth.App/UserManagerApp.cs
+++ b/OpenAuth.App/UserManagerApp.cs
@ -11,15 +11,12 @@ namespace OpenAuth.App
    {
        private IUserRepository _repository;
        private IOrgRepository _orgRepository;
-        private IUserModuleRepository _usermoduleRepository;

        public UserManagerApp(IUserRepository repository,
-            IOrgRepository orgRepository,
-            IUserModuleRepository usermoduleRepository)
+            IOrgRepository orgRepository)
        {
            _repository = repository;
            _orgRepository = orgRepository;
-            _usermoduleRepository = usermoduleRepository;
        }

        public int GetUserCntInOrg(int orgId)
@ -115,11 +112,5 @@ namespace OpenAuth.App
            _repository.SetOrg(user.Id, orgIds);
        }

-
-        public void AccessModules(int userId, int[] ids)
-        {
-            _usermoduleRepository.DeleteByUser(userId);
-            _usermoduleRepository.AddUserModule(userId, ids);
-        }
    }
 }
--- a/OpenAuth.App/ViewModel/RoleVM.cs
+++ b/OpenAuth.App/ViewModel/RoleVM.cs
@ -0,0 +1,64 @@
+// ***********************************************************************
+// Assembly         : OpenAuth.App
+// Author           : yubaolee
+// Created          : 11-29-2015
+//
+// Last Modified By : yubaolee
+// Last Modified On : 11-29-2015
+// ***********************************************************************
+// <copyright file="RoleVM.cs" company="www.cnblogs.com/yubaolee">
+//     Copyright (c) www.cnblogs.com/yubaolee. All rights reserved.
+// </copyright>
+// <summary>角色模型视图</summary>
+// ***********************************************************************
+
+using System;
+using Infrastructure;
+using OpenAuth.Domain;
+
+namespace OpenAuth.App.ViewModel
+{
+    public partial class RoleVM
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        /// <returns></returns>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        /// <returns></returns>
+        public string Name { get; set; }
+
+
+        /// <summary>
+        /// 所属部门节点语义ID
+        /// </summary>
+        /// <returns></returns>
+        public string OrgCascadeId { get; set; }
+
+        /// <summary>
+        /// 所属部门名称
+        /// </summary>
+        /// <returns></returns>
+        public string OrgName { get; set; }
+
+        /// <summary>
+        ///是否属于某用户 
+        /// </summary>
+        public bool IsBelongUser { get; set; }
+
+        public static implicit operator RoleVM(Role role)
+        {
+            return AutoMapperExt.ConvertTo<Role,RoleVM>(role);
+        }
+
+        public static implicit operator Role(RoleVM rolevm)
+        {
+            return AutoMapperExt.ConvertTo<RoleVM, Role>(rolevm);
+        }
+
+    }
+}
--- a/OpenAuth.Domain/Interface/IUserRoleRepository.cs
+++ b/OpenAuth.Domain/Interface/IUserRoleRepository.cs
@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.Domain.Interface
+{
+    public interface IUserRoleRepository : IRepository<UserRole>
+    {
+        void DeleteByUser(params int[] userIds);
+        void AddUserRole(int userId, params int[] roleIds);
+    }
+}
--- a/OpenAuth.Domain/OpenAuth.Domain.csproj
+++ b/OpenAuth.Domain/OpenAuth.Domain.csproj
@ -46,6 +46,7 @@
    <Compile Include="Interface\IOrgRepository.cs" />
    <Compile Include="Interface\IRepository.cs" />
    <Compile Include="Interface\IRoleRepository.cs" />
+    <Compile Include="Interface\IUserRoleRepository.cs" />
    <Compile Include="Interface\IUserModuleRepository.cs" />
    <Compile Include="Interface\IUserRepository.cs" />
    <Compile Include="Module.cs" />
--- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
@ -2,6 +2,7 @@ using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.Domain;
 using System;
+using System.Linq;
 using System.Web.Mvc;

 namespace OpenAuth.Mvc.Controllers
@ -86,6 +87,22 @@ namespace OpenAuth.Mvc.Controllers
            return JsonHelper.Instance.Serialize(orgs);
        }

+        public string AccessModule(int userId, string moduleIds)
+        {
+            try
+            {
+                var ids = moduleIds.Split(',').Select(id => int.Parse(id)).ToArray();
+                _app.AccessModules(userId, ids);
+            }
+            catch (Exception e)
+            {
+                BjuiResponse.message = e.Message;
+                BjuiResponse.statusCode = "300";
+            }
+
+            return JsonHelper.Instance.Serialize(BjuiResponse);
+        }
+
        #region 命令操作
        public ActionResult Add(int id = 0)
        {
--- a/OpenAuth.Mvc/Controllers/RoleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/RoleManagerController.cs
@ -1,9 +1,9 @@
-using System;
-using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
-using OpenAuth.App.ViewModel;
 using OpenAuth.Domain;
+using System;
+using System.Linq;
+using System.Web.Mvc;

 namespace OpenAuth.Mvc.Controllers
 {
@ -28,14 +28,13 @@ namespace OpenAuth.Mvc.Controllers
            return View(_app.Find(id));
        }

-        //添加或修改组织
+        //添加或修改角色
        [HttpPost]
        public string Add(Role role)
        {
            try
            {
                _app.AddOrUpdate(role);
-                
            }
            catch (Exception ex)
            {
@ -46,7 +45,7 @@ namespace OpenAuth.Mvc.Controllers
        }

        /// <summary>
-        /// 加载组织下面的所有用户
+        /// 加载角色下面的所有用户
        /// </summary>
        public string Load(int orgId, int pageCurrent = 1, int pageSize = 30)
        {
@ -70,5 +69,20 @@ namespace OpenAuth.Mvc.Controllers

            return JsonHelper.Instance.Serialize(BjuiResponse);
        }
+
+        #region 为用户设置角色界面
+        public ActionResult LookUpMulti(int userId)
+        {
+            ViewBag.UserId = userId;
+            return View(_app.LoadWithUser(userId));
+        }
+
+        public string AccessRoles(int userId, string ids)
+        {
+            var roleids = ids.Split(',').Select(id => int.Parse(id)).ToArray();
+            _app.AccessRole(userId, roleids);
+            return JsonHelper.Instance.Serialize(BjuiResponse);
+        }
+        #endregion
    }
 }
--- a/OpenAuth.Mvc/Controllers/UserManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs
@ -1,12 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Mvc.Models;
-using WebGrease.Css.Extensions;

 namespace OpenAuth.Mvc.Controllers
 {
@ -74,20 +71,6 @@ namespace OpenAuth.Mvc.Controllers
            return JsonHelper.Instance.Serialize(BjuiResponse);
        }

-        public string AccessModule(int userId, string moduleIds)
-        {
-            try
-            {
-               var ids = moduleIds.Split(',').Select(id => int.Parse(id)).ToArray();
-                _app.AccessModules(userId, ids);
-            }
-            catch (Exception e)
-            {
-                BjuiResponse.message = e.Message;
-                BjuiResponse.statusCode = "300";
-            }
-
-            return JsonHelper.Instance.Serialize(BjuiResponse);
-        }
+        
    }
 }
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@ -624,6 +624,7 @@
    <Content Include="Views\UserManager\Add.cshtml" />
    <Content Include="Views\RoleManager\Add.cshtml" />
    <Content Include="Views\RoleManager\Index.cshtml" />
+    <Content Include="Views\RoleManager\LookupMulti.cshtml" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--- a/OpenAuth.Mvc/Views/ModuleManager/LookupMulti.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/LookupMulti.cshtml
@ -89,7 +89,7 @@
    }

    function save() {
-        $.post('UserManager/AccessModule', { userId: $('#userId').val(), moduleIds: moduleIds },
+        $.post('ModuleManager/AccessModule', { userId: $('#userId').val(), moduleIds: moduleIds },
            function (json) {
                var rel = $.parseJSON(json);
                if (rel.statusCode == "200") {
--- a/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/LookupMulti.cshtml
@ -0,0 +1,77 @@
+@model List<OpenAuth.App.ViewModel.RoleVM>
+@{
+    ViewBag.Title = "title";
+    Layout = null;
+}
+@*<div class="bjui-pageHeader">
+        <div class="bjui-searchBar">
+            <label>名称：</label><input type="text" value="" name="code" size="10" />&nbsp;
+            <button type="submit" class="btn-default" data-icon="search">查询</button>&nbsp;
+            <a class="btn btn-orange" href="javascript:;" data-toggle="reloadsearch" data-clear-query="true" data-icon="undo">清空查询</a>&nbsp;
+            <div class="pull-right">
+                <input type="checkbox" name="lookupType" value="1" data-toggle="icheck" data-label="追加" checked>
+                <button type="button" class="btn-blue" data-toggle="lookupback" data-lookupid="ids" data-warn="请至少选择一项职业" data-icon="check-square-o">选择选中</button>
+            </div>
+        </div>
+    </div>*@
+
+<div class="bjui-pageContent">
+    <input style="display: none" id="userId" value="@ViewBag.UserId" />
+    <table data-selected-multi="true" class="table table-bordered" data-toggle="tablefixed" data-width="100%">
+        <thead>
+            <tr>
+                <th data-order-field="id">ID</th>
+                <th data-order-field="name">名称</th>
+                <th data-order-field="note">所属部门</th>
+                <th class="orderby asc" data-order-field="date">部门级联ID</th>
+                <th >是否已经分配</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var role in Model)
+            {
+                <tr data-id="@role.Id">
+                    <td>@role.Id</td>
+                    <td>@role.Name</td>
+                    <td>@role.OrgName</td>
+                    <td>@role.OrgCascadeId</td>
+                    <td><input type="checkbox" disabled data-toggle="icheck" 
+                               @if (role.IsBelongUser) { <text> checked </text>  }></td>
+                </tr>
+            }
+        </tbody>
+    </table>
+</div>
+<div class="bjui-pageFooter">
+    <ul>
+        <li><button type="button" class="btn-close" data-icon="close">关闭</button></li>
+        <li>
+            <button type="button" class="btn-blue"
+                    data-url="RoleManager/AccessRoles?userid={#userId}&ids={#bjui-selected}"
+                    data-toggle="doajax" data-icon="check-square-o">
+                设置权限
+            </button>
+        </li>
+    </ul>
+</div>
+
+<script type="text/javascript">
+    var moduleIds;
+    $(document).ready(function () {
+
+    });
+
+    function save() {
+        $.post('UserManager/AccessModule', { userId: $('#userId').val(), moduleIds: moduleIds },
+            function (json) {
+                var rel = $.parseJSON(json);
+                if (rel.statusCode == "200") {
+                    $(this).alertmsg('ok', rel.message);
+                } else {
+                    $(this).alertmsg('error', rel.message);
+                }
+            });
+    }
+
+    //@@ sourceURL=lookupMulti.js
+</script>
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@ -22,23 +22,6 @@
    $(document).ready(function () {
        initZtree();
        loadDataGrid();
-
-        $('#btnAccess').on('afterchange.bjui.lookup', function (e, data) {
-            var accessIds = data.value; //得到授权的模块IDS
-
-            var selected = getSelected(2);
-            if (selected == null) return;
-
-            $.post('UserManager/AccessModule', { userId: selected, moduleIds: accessIds },
-                function (json) {
-                    var rel = $.parseJSON(json);
-                    if (rel.statusCode == "200") {
-                        $(this).alertmsg('ok', rel.message);
-                    } else {
-                        $(this).alertmsg('error', rel.message);
-                    }
-                });
-        });
    });
    //加载数据到datagrid
    function loadDataGrid() {
@ -54,9 +37,8 @@
            toolbarCustom: '<a href="/UserManager/Add" class="btn btn-green" data-icon ="plus"  ' +
                'data-toggle="dialog" data-id="dialog-mask" data-mask="true" data-on-close="refreshGrid">添加</a>' +
                '<button class=" btn-green" onclick="editOrg()" data-icon="pencil" type="button">编辑</button>' +
-                '<button id="btnAccess" class=" btn-green" data-toggle="lookupbtn" ' +
-                'name="ids" data-id="" data-selectType="user" data-url="/ModuleManager/LookupMulti">用户菜单授权</button>' +
-                '<button type="button" class="btn btn-green" onclick="openModuleAccess(this)">用户模块授权</button>',
+                '<button type="button" class="btn btn-green" onclick="openModuleAccess(this)">用户模块授权</button>'+
+                '<button type="button" class ="btn btn-green" onclick="openRoleAccess(this)">用户角色授权</button>',
            columns: [
                {
                    name: 'Id',
@ -210,5 +192,20 @@
            }
        });
    }
+
+    //用户角色授权
+    function openRoleAccess(obj) {
+        var selected = getSelected(2);
+        if (selected == null) return;
+
+        $(obj).dialog({
+            id: 'accessUserRole',
+            url: '/RoleManager/LookupMulti',
+            title: '为用户分配角色',
+            data: {
+                userId: selected
+            }
+        });
+    }
    //@@ sourceURL=userManagerIndex.js
 </script>
--- a/OpenAuth.Mvc/Web.config
+++ b/OpenAuth.Mvc/Web.config
@ -39,11 +39,15 @@

 <autofac defaultAssembly=" OpenAuth.Repository">
  <components>
-    <component type=" OpenAuth.Repository.UserRepository" service=" OpenAuth.Domain.Interface.IUserRepository,OpenAuth.Domain" />
-    <component type=" OpenAuth.Repository.OrgRepository" service="OpenAuth.Domain.Interface.IOrgRepository,OpenAuth.Domain" />
-    <component type=" OpenAuth.Repository.RoleRepository" service="OpenAuth.Domain.Interface.IRoleRepository,OpenAuth.Domain" />
+    <component type=" OpenAuth.Repository.UserRepository" 
+               service=" OpenAuth.Domain.Interface.IUserRepository,OpenAuth.Domain" />
+    <component type=" OpenAuth.Repository.OrgRepository" 
+               service="OpenAuth.Domain.Interface.IOrgRepository,OpenAuth.Domain" />
+    <component type=" OpenAuth.Repository.RoleRepository" 
+               service="OpenAuth.Domain.Interface.IRoleRepository,OpenAuth.Domain" />
    <component type=" OpenAuth.Repository.ModuleRepository" service="OpenAuth.Domain.Interface.IModuleRepository,OpenAuth.Domain" />
    <component type=" OpenAuth.Repository.UserModuleRepository" service="OpenAuth.Domain.Interface.IUserModuleRepository,OpenAuth.Domain" />
+    <component type=" OpenAuth.Repository.UserRoleRepository" service="OpenAuth.Domain.Interface.IUserRoleRepository,OpenAuth.Domain" />
  </components>
 </autofac>

--- a/OpenAuth.Repository/OpenAuth.Repository.csproj
+++ b/OpenAuth.Repository/OpenAuth.Repository.csproj
@ -73,6 +73,7 @@
    <Compile Include="RoleRepository.cs" />
    <Compile Include="UserModuleRepository.cs" />
    <Compile Include="UserRepository.cs" />
+    <Compile Include="UserRoleRepository.cs" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\Infrastructure\Infrastructure.csproj">
--- a/OpenAuth.Repository/UserRoleRepository.cs
+++ b/OpenAuth.Repository/UserRoleRepository.cs
@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OpenAuth.Domain;
+using OpenAuth.Domain.Interface;
+
+namespace OpenAuth.Repository
+{
+    public class UserRoleRepository :BaseRepository<UserRole>, IUserRoleRepository
+    {
+        public void DeleteByUser(params int[] userIds)
+        {
+             Delete(u =>userIds.Contains(u.UserId));
+        }
+
+        public void AddUserRole(int userId, params int[] roleIds)
+        {
+
+            foreach (var roleid in roleIds)
+            {
+                Add(new UserRole
+                {
+                    UserId = userId,
+                    RoleId = roleid,
+                    OperateTime = DateTime.Now
+                });
+            }
+            Save();
+            
+        }
+    }
+}
--- a/OpenAuth.UnitTest/TestRoleApp.cs
+++ b/OpenAuth.UnitTest/TestRoleApp.cs
@ -16,7 +16,9 @@ namespace OpenAuth.UnitTest
    public class TestRoleApp
    {

-        private RoleManagerApp _app = new RoleManagerApp(new RoleRepository(), new OrgRepository());
+        private RoleManagerApp _app = new RoleManagerApp(new RoleRepository(), 
+            new OrgRepository(),
+            new UserRoleRepository());
        private string _time = DateTime.Now.ToString("HH_mm_ss_ms");


--- a/OpenAuth.UnitTest/TestUserApp.cs
+++ b/OpenAuth.UnitTest/TestUserApp.cs
@ -17,8 +17,7 @@ namespace OpenAuth.UnitTest
    {

        private UserManagerApp _app = new UserManagerApp(new UserRepository(), 
-            new OrgRepository(),
-            new UserModuleRepository());
+            new OrgRepository());
        private string _time = DateTime.Now.ToString("HH_mm_ss_ms");