添加角色处理

OpenAuth.Mvc/AutofacExt.cs

@@ -12,12 +12,12 @@
 // <summary>IOC<4F><43>ʼ<EFBFBD><CABC></summary>
 // ***********************************************************************
 
-using System.Reflection;
-using System.Web.Mvc;
 using Autofac;
 using Autofac.Configuration;
 using Autofac.Integration.Mvc;
 using OpenAuth.App;
+using System.Reflection;
+using System.Web.Mvc;
 
 namespace OpenAuth.Mvc
 {
@@ -27,12 +27,11 @@ namespace OpenAuth.Mvc
         {
             var builder = new ContainerBuilder();
 
-            builder.RegisterModule(new ConfigurationSettingsReader("autofac")); 
+            builder.RegisterModule(new ConfigurationSettingsReader("autofac"));
             builder.RegisterType<LoginApp>();
             builder.RegisterType<OrgManagerApp>();
             builder.RegisterType<UserManagerApp>();
-
-
+            builder.RegisterType<RoleManagerApp>();
             // Register your MVC controllers.
             builder.RegisterControllers(typeof(MvcApplication).Assembly);
 

OpenAuth.Mvc/Controllers/RoleManagerController.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Web.Mvc;
+using Infrastructure;
+using OpenAuth.App;
+using OpenAuth.App.ViewModel;
+using OpenAuth.Domain;
+
+namespace OpenAuth.Mvc.Controllers
+{
+    public class RoleManagerController : BaseController
+    {
+        private RoleManagerApp _app;
+
+        public RoleManagerController()
+        {
+            _app = (RoleManagerApp)DependencyResolver.Current.GetService(typeof(RoleManagerApp));
+        }
+
+        //
+        // GET: /RoleManager/
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        public ActionResult Add(int id = 0)
+        {
+            return View(_app.Find(id));
+        }
+
+        //添加或修改组织
+        [HttpPost]
+        public string Add(Role view)
+        {
+            try
+            {
+                _app.AddOrUpdate(view);
+                
+            }
+            catch (Exception ex)
+            {
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = ex.Message;
+            }
+            return JsonHelper.Instance.Serialize(BjuiResponse);
+        }
+
+        /// <summary>
+        /// 加载组织下面的所有用户
+        /// </summary>
+        public string Load(int orgId, int pageCurrent = 1, int pageSize = 30)
+        {
+            return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize));
+        }
+
+        //获取组织下面用户个数
+        public int GetCount(int orgId)
+        {
+            return _app.GetRoleCntInOrg(orgId);
+        }
+
+        public string Delete(string Id)
+        {
+            try
+            {
+                foreach (var obj in Id.Split(','))
+                {
+                    _app.Delete(int.Parse(obj));
+                }
+            }
+            catch (Exception e)
+            {
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = e.Message;
+            }
+
+            return JsonHelper.Instance.Serialize(BjuiResponse);
+        }
+    }
+}

OpenAuth.Mvc/OpenAuth.Mvc.csproj

@@ -127,6 +127,7 @@
     <Compile Include="Controllers\BaseController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\OrgManagerController.cs" />
+    <Compile Include="Controllers\RoleManagerController.cs" />
     <Compile Include="Controllers\UserManagerController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
@@ -617,6 +618,8 @@
     <Content Include="Views\OrgManager\LookupParent.cshtml" />
     <Content Include="Views\UserManager\Index.cshtml" />
     <Content Include="Views\UserManager\Add.cshtml" />
+    <Content Include="Views\RoleManager\Add.cshtml" />
+    <Content Include="Views\RoleManager\Index.cshtml" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

OpenAuth.Mvc/Views/Home/Index.cshtml

@@ -206,6 +206,7 @@
                                     <li data-id="99" data-pid="0" data-faicon="folder-open-o" data-faicon-close="folder-o">系统设置</li>
                                     <li data-id="100" data-pid="99" data-url="OrgManager/Index" data-tabid="orgManager" data-faicon="caret-right">机构管理</li>
                                     <li data-id="101" data-pid="99" data-url="UserManager/Index" data-tabid="userManager" data-faicon="caret-right">用户管理</li>
+                                    <li data-id="102" data-pid="99" data-url="RoleManager/Index" data-tabid="roleManager" data-faicon="caret-right">角色管理</li>
                                 </ul>
                             </div>
                         </li>

OpenAuth.Mvc/Views/RoleManager/Add.cshtml

@@ -0,0 +1,132 @@
+@model OpenAuth.Domain.Role
+@{
+    ViewBag.Title = "title";
+    Layout = null;
+}
+
+<div class="bjui-pageContent">
+    <form action="/RoleManager/Add" class="pageForm" data-toggle="validate">
+        <table class="table table-condensed table-hover">
+            <tbody>
+                <tr>
+                    <td align="center"><h3>* 添加</h3></td>
+                </tr>
+                <tr>
+                    <td>
+                        @Html.HiddenFor(m => m.Id)
+                        @Html.HiddenFor(m => m.CreateTime)
+                <tr>
+                    <td>
+
+                        <label for="Name" class="control-label x90">角色名称：</label>
+                        <input type="text" name="Name" id="Name" value="@Model.Name"
+                               data-rule="required" size="20">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+
+                        <label for="Status" class="control-label x90">当前状态：</label>
+                        <input type="text" name="Status" id="Status" value="@Model.Status"
+                               data-rule="required" size="20">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+
+                        <label for="Type" class="control-label x90">角色类型：</label>
+                        <input type="text" name="Type" id="Type" value="@Model.Type"
+                               data-rule="required" size="20">
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+
+                        <label for="CreateId" class="control-label x90">创建人ID：</label>
+                        <input type="text" name="CreateId" id="CreateId" value="@Model.CreateId"
+                               data-rule="required" size="20">
+                    </td>
+                </tr>
+
+                <tr>
+                    <td>
+                        <label for="OrgName" class="control-label x90">所属机构：</label>
+                        <input id="OrgId" name="OrgId" value="" style="display: none" />
+                        <input type="text" name="OrgName" id="OrgName"
+                               data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="">
+                        <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+<div class="bjui-pageFooter">
+    <ul>
+        <li><button type="button" class="btn-close">关闭</button></li>
+        <li><button type="submit" class="btn-green">保存</button></li>
+    </ul>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        Init();
+    });
+    function Init() {
+        var setting = {
+            view: {
+                selectedMulti: false
+            },
+            check: {
+                enable: true,
+                chkStyle: "checkbox",
+                chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
+            },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: zTreeOnClick,
+                onCheck: zTreeCheck
+            }
+        };
+        $.getJSON('OrgManager/LoadOrg', function (json) {
+            var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
+            zTreeObj.expandAll(true);
+        });
+    }
+
+    function zTreeCheck(e, treeId, treeNode) {
+        var zTree = $.fn.zTree.getZTreeObj(treeId),
+            nodes = zTree.getCheckedNodes(true);
+        var ids = '', names = '';
+        for (var i = 0; i < nodes.length; i++) {
+            ids += ',' + nodes[i].Id;
+            names += ',' + nodes[i].Name;
+        }
+        if (ids.length > 0) {  //去掉第一个逗号
+            ids = ids.substr(1);
+            names = names.substr(1);
+        }
+
+        var $from = $('#' + treeId).data('fromObj');
+        if ($from && $from.length) $from.val(names);
+
+        $('#OrganizationIds').val(ids);
+    }
+    function zTreeOnClick(event, treeId, treeNode) {
+        var zTree = $.fn.zTree.getZTreeObj(treeId);
+        zTree.checkNode(treeNode, !treeNode.checked, true, true);
+        event.preventDefault();
+    }
+</script>

OpenAuth.Mvc/Views/RoleManager/Index.cshtml

@@ -0,0 +1,175 @@
+@{
+    string _prefix = "Role";
+    var _treeId = _prefix + "Tree";
+    var _gridId = _prefix + "Grid";
+    var _treeDetail = _prefix + "Detail";
+}
+<div class="bjui-pageContent">
+    <div class="clearfix">
+        <div style="float: left; width: 220px; overflow: auto;" class="table table-bordered">
+            <ul id="@_treeId" class="ztree"></ul>
+        </div>
+
+        <div id="@_treeDetail" style="margin-left: 225px;">
+        </div>
+    </div>
+</div>
+
+
+<script type="text/javascript">
+    var gridid = '#@_gridId';
+    var selectedId = 0;
+    $(document).ready(function () {
+        initZtree();
+        loadDataGrid();
+    });
+    //加载数据到datagrid
+    function loadDataGrid() {
+        //b-jui的datagrid需要重新处理HTML
+        $('#@_treeDetail').empty()
+            .append('<table id="@_gridId" class="table table-bordered"></table>');
+
+        $(gridid).datagrid({
+            gridTitle: '列表',
+            showToolbar: true,
+            filterThead: false,
+            toolbarItem: 'refresh, |, del',
+            toolbarCustom: '<a href="/RoleManager/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="editRole()" data-icon="pencil" type="button">编辑</button>',
+            columns: [
+               {
+                    name: 'Id',
+                    label: '流水号'
+                    , hide: true
+               },    
+               {
+                    name: 'Name',
+                    label: '角色名称'
+               },    
+               {
+                    name: 'Status',
+                    label: '当前状态'
+               },    
+               {
+                    name: 'Type',
+                    label: '角色类型'
+               },    
+               {
+                    name: 'CreateTime',
+                    label: '创建时间'
+                    , type: 'date',
+                    width: 180,
+                    pattern: 'yyyy-MM-dd HH:mm:ss'
+               },    
+               {
+                    name: 'CreateId',
+                    label: '创建人ID'
+               },    
+               {
+                    name: 'OrgId',
+                    label: '所属部门流水号'
+               },    
+               {
+                    name: 'OrgCascadeId',
+                    label: '所属部门节点语义ID'
+               },    
+               {
+                    name: 'OrgName',
+                    label: '所属部门名称'
+               },    
+            ],
+            //  data: data,
+            dataUrl: 'RoleManager/Load?orgId=' + selectedId,
+            delUrl: 'Role/Delete',
+            delPK: "Id",
+            fullGrid: true,
+            showLinenumber: true,
+            showCheckboxcol: true,
+            paging: true,
+            filterMult: false,
+            showTfoot: true,
+            height: '700',
+            delCallback: function (delResult) {
+                if (delResult.statusCode == "200")
+                    loadDataGrid();
+                else {
+                    $(this).alertmsg('warn', delResult.message);
+                }
+            }
+        });
+    }
+
+    function zTreeOnClick(event, treeId, treeNode) {
+        selectedId = treeNode.Id;
+        loadDataGrid();
+    }
+
+    function initZtree() {
+        var setting = {
+            view: {selectedMulti: false},
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {onClick: zTreeOnClick}
+        };
+        $.getJSON('OrgManager/LoadOrg', function (json) {
+            var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json);
+            zTreeObj.expandAll(true);
+        });
+    }
+
+    //获取勾选的值
+    //column:为从0开始的列标识
+    function getSelected(column) {
+        var selected = $(gridid).data('selectedTrs');
+        if (selected == null || selected.length == 0) {
+            $(this).alertmsg('warn', '至少选择一个对象', {
+                displayMode: 'slide',
+                title: '重要提示'
+            });
+            return null;
+        }
+
+        //todo：下面这段只能chrome有效
+        var records = new Array();
+        selected.each(function () {
+            records[records.length] = this.children[column].innerText;
+        });
+
+        return records[0];
+    }
+
+
+
+    //自定义的编辑按钮
+    function editRole() {
+        var selected = getSelected(2);
+        if (selected == null) return;
+
+        $(this).dialog({
+            id: 'editDialog',
+            url: '/RoleManager/Add?id=' + selected,
+            title: '编辑',
+            onClose:function() {
+                refreshGrid();
+            }
+        });
+
+    }
+
+    function refreshGrid() {
+        $('#@_gridId').datagrid('refresh');
+       // loadDataGrid();
+    }
+    //@@ sourceURL=RoleManagerIndex.js
+</script>

OpenAuth.Mvc/Views/UserManager/Add.cshtml

@@ -1,130 +1,130 @@
-@model OpenAuth.App.ViewModel.UserView
-@{
-    ViewBag.Title = "title";
-    Layout = null;
-}
-
-<div class="bjui-pageContent">
-    <form action="/UserManager/Add" class="pageForm" data-toggle="validate">
-        <table class="table table-condensed table-hover">
-            <tbody>
-                <tr>
-                    <td align="center"><h3>* 添加</h3></td>
-                </tr>
-                <tr>
-                    <td>
-                        @Html.HiddenFor(m =>m.CreateTime)
-                        @Html.HiddenFor(m =>m.Id)
-                        <label for="Account" class="control-label x90">用户账号：</label>
-                        <input type="text" name="Account" id="Account" value="@Model.Account"
-                               data-rule="required" size="20">
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label x90">姓名/昵称：</label>
-                        <input type="text" name="Name" id="Name" value="@Model.Name" size="20">
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Organizations" class="control-label x90">所属机构：</label>
-                        <input id="OrganizationIds" name="OrganizationIds" value="@Model.OrganizationIds" style="display: none" />
-                        <input type="text" name="Organizations" id="Organizations" 
-                               data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.Organizations">
-                        <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree" >
-                        </ul>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Status" class="control-label x85">设置状态：</label>
-
-                        <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
-                            <option value="0">正常</option>
-                            <option value="1">禁用</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Sex" class="control-label x85">性别：</label>
-
-                        <select name="Sex" id="Sex" data-toggle="selectpicker" data-rule="required">
-                            <option value="0">男</option>
-                            <option value="1">女</option>
-                        </select>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </form>
-</div>
-<div class="bjui-pageFooter">
-    <ul>
-        <li><button type="button" class="btn-close">关闭</button></li>
-        <li><button type="submit" class="btn-green">保存</button></li>
-    </ul>
-</div>
-
-<script type="text/javascript">
-    $(document).ready(function () {
-        Init();
-    });
-    function Init() {
-        var setting = {
-            view: {
-                selectedMulti: false
-            },
-            check: {
-                enable: true,
-                chkStyle: "checkbox",
-                chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
-            },
-            data: {
-                key: {
-                    name: 'Name',
-                    title: 'Name'
-                },
-                simpleData: {
-                    enable: true,
-                    idKey: 'Id',
-                    pIdKey: 'ParentId',
-                    rootPId: 'null'
-                }
-            },
-            callback: {
-                onClick: zTreeOnClick,
-                onCheck: zTreeCheck
-            }
-        };
-        $.getJSON('OrgManager/LoadOrg', function (json) {
-            var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
-            zTreeObj.expandAll(true);
-        });
-    }
-
-    function zTreeCheck(e, treeId, treeNode) {
-        var zTree = $.fn.zTree.getZTreeObj(treeId),
-            nodes = zTree.getCheckedNodes(true);
-        var ids = '', names = '';
-        for (var i = 0; i < nodes.length; i++) {
-            ids += ',' + nodes[i].Id;
-            names += ',' + nodes[i].Name;
-        }
-        if (ids.length > 0) {  //去掉第一个逗号
-            ids = ids.substr(1);
-            names = names.substr(1);
-        }
-
-        var $from = $('#' + treeId).data('fromObj');
-        if ($from && $from.length) $from.val(names);
-
-        $('#OrganizationIds').val(ids);
-    }
-    function zTreeOnClick(event, treeId, treeNode) {
-        var zTree = $.fn.zTree.getZTreeObj(treeId);
-        zTree.checkNode(treeNode, !treeNode.checked, true, true);
-        event.preventDefault();
-    }
+@model OpenAuth.App.ViewModel.UserView
+@{
+    ViewBag.Title = "title";
+    Layout = null;
+}
+
+<div class="bjui-pageContent">
+    <form action="/UserManager/Add" class="pageForm" data-toggle="validate">
+        <table class="table table-condensed table-hover">
+            <tbody>
+                <tr>
+                    <td align="center"><h3>* 添加</h3></td>
+                </tr>
+                <tr>
+                    <td>
+                        @Html.HiddenFor(m =>m.CreateTime)
+                        @Html.HiddenFor(m =>m.Id)
+                        <label for="Account" class="control-label x90">用户账号：</label>
+                        <input type="text" name="Account" id="Account" value="@Model.Account"
+                               data-rule="required" size="20">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label x90">姓名/昵称：</label>
+                        <input type="text" name="Name" id="Name" value="@Model.Name" size="20">
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Organizations" class="control-label x90">所属机构：</label>
+                        <input id="OrganizationIds" name="OrganizationIds" value="@Model.OrganizationIds" style="display: none" />
+                        <input type="text" name="Organizations" id="Organizations" 
+                               data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.Organizations">
+                        <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree" >
+                        </ul>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Status" class="control-label x85">设置状态：</label>
+
+                        <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
+                            <option value="0">正常</option>
+                            <option value="1">禁用</option>
+                        </select>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Sex" class="control-label x85">性别：</label>
+
+                        <select name="Sex" id="Sex" data-toggle="selectpicker" data-rule="required">
+                            <option value="0">男</option>
+                            <option value="1">女</option>
+                        </select>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+<div class="bjui-pageFooter">
+    <ul>
+        <li><button type="button" class="btn-close">关闭</button></li>
+        <li><button type="submit" class="btn-green">保存</button></li>
+    </ul>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        Init();
+    });
+    function Init() {
+        var setting = {
+            view: {
+                selectedMulti: false
+            },
+            check: {
+                enable: true,
+                chkStyle: "checkbox",
+                chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
+            },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: zTreeOnClick,
+                onCheck: zTreeCheck
+            }
+        };
+        $.getJSON('OrgManager/LoadOrg', function (json) {
+            var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
+            zTreeObj.expandAll(true);
+        });
+    }
+
+    function zTreeCheck(e, treeId, treeNode) {
+        var zTree = $.fn.zTree.getZTreeObj(treeId),
+            nodes = zTree.getCheckedNodes(true);
+        var ids = '', names = '';
+        for (var i = 0; i < nodes.length; i++) {
+            ids += ',' + nodes[i].Id;
+            names += ',' + nodes[i].Name;
+        }
+        if (ids.length > 0) {  //去掉第一个逗号
+            ids = ids.substr(1);
+            names = names.substr(1);
+        }
+
+        var $from = $('#' + treeId).data('fromObj');
+        if ($from && $from.length) $from.val(names);
+
+        $('#OrganizationIds').val(ids);
+    }
+    function zTreeOnClick(event, treeId, treeNode) {
+        var zTree = $.fn.zTree.getZTreeObj(treeId);
+        zTree.checkNode(treeNode, !treeNode.checked, true, true);
+        event.preventDefault();
+    }
 </script>

OpenAuth.Mvc/Views/UserManager/Index.cshtml

@@ -174,8 +174,8 @@
     }
 
     function refreshGrid() {
-        //grid.refresh();
-        loadDataGrid();
+        $('#@_gridId').datagrid('refresh');
+       // loadDataGrid();
     }
     //@@ sourceURL=userManagerIndex.js
 </script>

OpenAuth.Mvc/Web.config

@@ -41,6 +41,7 @@
   <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" />
   </components>
 </autofac>