From b8fb3f7a2d27c28560089dffb420283d535f2f6d Mon Sep 17 00:00:00 2001 From: yubaolee Date: Sat, 19 Dec 2015 21:48:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=BA=90=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E4=B8=BA=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E3=80=81=E7=AC=AC=E4=B8=89=E6=96=B9=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E6=8E=88=E6=9D=83=E5=81=9A=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CodeSmith/proj/cshtml.csp | 30 -- CodeSmith/{ => 带其他级联}/Add.cshtml.cst | 288 ++++++++--------- CodeSmith/{ => 带其他级联}/Application.cst | 274 ++++++++-------- CodeSmith/{ => 带其他级联}/Controller.cst | 217 ++++++------- CodeSmith/{ => 带其他级联}/IRepository.cst | 54 ++-- CodeSmith/{ => 带其他级联}/Index.cshtml.cst | 296 +++++++++--------- CodeSmith/本身带级联/Add.cshtml.cst | 145 +++++++++ CodeSmith/本身带级联/Application.cst | 138 ++++++++ CodeSmith/本身带级联/Controller.cst | 110 +++++++ CodeSmith/本身带级联/IRepository.cst | 28 ++ CodeSmith/本身带级联/Index.cshtml.cst | 148 +++++++++ OpenAuth.App/OpenAuth.App.csproj | 1 + OpenAuth.App/ResourceManagerApp.cs | 107 +++++++ .../Interface/IResourceRepository.cs | 17 + OpenAuth.Domain/OpenAuth.Domain.csproj | 1 + .../Controllers/ResourceManagerController.cs | 87 +++++ OpenAuth.Mvc/OpenAuth.Mvc.csproj | 3 + .../Views/CategoryManager/Index.cshtml | 3 - OpenAuth.Mvc/Views/ResourceManager/Add.cshtml | 152 +++++++++ .../Views/ResourceManager/Index.cshtml | 170 ++++++++++ .../OpenAuth.Repository.csproj | 1 + OpenAuth.Repository/ResourceRepository.cs | 41 +++ OpenAuth.Repository/RoleRepository.cs | 42 ++- 建表&初始化数据.sql | Bin 129830 -> 133242 bytes 24 files changed, 1733 insertions(+), 620 deletions(-) delete mode 100644 CodeSmith/proj/cshtml.csp rename CodeSmith/{ => 带其他级联}/Add.cshtml.cst (97%) rename CodeSmith/{ => 带其他级联}/Application.cst (96%) rename CodeSmith/{ => 带其他级联}/Controller.cst (96%) rename CodeSmith/{ => 带其他级联}/IRepository.cst (97%) rename CodeSmith/{ => 带其他级联}/Index.cshtml.cst (97%) create mode 100644 CodeSmith/本身带级联/Add.cshtml.cst create mode 100644 CodeSmith/本身带级联/Application.cst create mode 100644 CodeSmith/本身带级联/Controller.cst create mode 100644 CodeSmith/本身带级联/IRepository.cst create mode 100644 CodeSmith/本身带级联/Index.cshtml.cst create mode 100644 OpenAuth.App/ResourceManagerApp.cs create mode 100644 OpenAuth.Domain/Interface/IResourceRepository.cs create mode 100644 OpenAuth.Mvc/Controllers/ResourceManagerController.cs create mode 100644 OpenAuth.Mvc/Views/ResourceManager/Add.cshtml create mode 100644 OpenAuth.Mvc/Views/ResourceManager/Index.cshtml create mode 100644 OpenAuth.Repository/ResourceRepository.cs diff --git a/CodeSmith/proj/cshtml.csp b/CodeSmith/proj/cshtml.csp deleted file mode 100644 index 50829c3d..00000000 --- a/CodeSmith/proj/cshtml.csp +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - $(ConnectionString1) - SchemaExplorer.SqlSchemaProvider,SchemaExplorer.SqlSchemaProvider - - dbo - Module -
- - Module - - - - $(ConnectionString1) - SchemaExplorer.SqlSchemaProvider,SchemaExplorer.SqlSchemaProvider - - dbo - Role -
- - Role - - - \ No newline at end of file diff --git a/CodeSmith/Add.cshtml.cst b/CodeSmith/带其他级联/Add.cshtml.cst similarity index 97% rename from CodeSmith/Add.cshtml.cst rename to CodeSmith/带其他级联/Add.cshtml.cst index 6c1dab2b..5b4f093e 100644 --- a/CodeSmith/Add.cshtml.cst +++ b/CodeSmith/带其他级联/Add.cshtml.cst @@ -1,145 +1,145 @@ -<%-- -Name: Database Table Properties -Author: Paul Welter -Description: Create a list of properties from a database table ---%> -<%@ CodeTemplate Language="C#" TargetLanguage="C#" Debug="False" Encoding="utf-8" Description="添加模块" %> -<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context" -Description="连接的数据库" %> -<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> -<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> -<%@ Property Name="CascadeId" Type="String" Category="" Default="ParentId" Description="级联字段" %> -<%@ Property Name="CascadeName" Type="String" Category="" Default="ParentName" Description="级联显示的文字" %> -<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> -<%@ Assembly Name="SchemaExplorer" %> -<%@ Import Namespace="SchemaExplorer" %> - -<%if(NeedViewModel){ %> -@model OpenAuth.App.ViewModel.<%=GetModelName()%> -<%} else{ %> -@model OpenAuth.Domain.<%=GetModelName()%> -<%} %> -@{ - ViewBag.Title = "<%=GetModelName()%>编辑界面"; - Layout = null; -} - -
-
- - - <% foreach (ColumnSchema column in this.SourceTable.Columns) { - if(column.Name == CascadeName) continue; - %> - - - - <% } %> - -
- <%if(column.IsPrimaryKeyMember){ %> - @Html.HiddenFor(m =>m.Id) - <% } else if(column.Name == CascadeId) {%> - - - -
    - - <% } else if(CSharpAlias[column.SystemType.FullName] == "bool") {%> - - - - <%} else if(CSharpAlias[column.SystemType.FullName] == "int") {%> - - - <%} else{%> - - - <%} %> -
    -
    -
    -
    - -
    - - +<%if(NeedViewModel){ %> +@model OpenAuth.App.ViewModel.<%=GetModelName()%> +<%} else{ %> +@model OpenAuth.Domain.<%=GetModelName()%> +<%} %> +@{ + ViewBag.Title = "<%=GetModelName()%>编辑界面"; + Layout = null; +} + +
    +
    + + + <% foreach (ColumnSchema column in this.SourceTable.Columns) { + if(column.Name == CascadeName) continue; + %> + + + + <% } %> + +
    + <%if(column.IsPrimaryKeyMember){ %> + @Html.HiddenFor(m =>m.Id) + <% } else if(column.Name == CascadeId) {%> + + + +
      + + <% } else if(CSharpAlias[column.SystemType.FullName] == "bool") {%> + + + + <%} else if(CSharpAlias[column.SystemType.FullName] == "int") {%> + + + <%} else{%> + + + <%} %> +
      +
      +
      +
      + +
      + + \ No newline at end of file diff --git a/CodeSmith/Application.cst b/CodeSmith/带其他级联/Application.cst similarity index 96% rename from CodeSmith/Application.cst rename to CodeSmith/带其他级联/Application.cst index c2636ff5..d6120175 100644 --- a/CodeSmith/Application.cst +++ b/CodeSmith/带其他级联/Application.cst @@ -1,138 +1,138 @@ -<%-- -Name: Database Table Properties -Author: Paul Welter -Description: Create a list of properties from a database table ---%> -<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="应用层" %> -<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> -<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> -<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> -<%@ Assembly Name="SchemaExplorer" %> -<%@ Import Namespace="SchemaExplorer" %> - - -<%if(NeedViewModel){ %> -using OpenAuth.App.ViewModel; -<%} %> -using OpenAuth.Domain; -using OpenAuth.Domain.Interface; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace OpenAuth.App -{ - public class <%=ModuleName%>ManagerApp - { - private I<%=ModuleName%>Repository _repository; - private IOrgRepository _orgRepository; - - public <%=ModuleName%>ManagerApp(I<%=ModuleName%>Repository repository, - IOrgRepository orgRepository) - { - _repository = repository; - _orgRepository = orgRepository; - } - - public int Get<%=GetModelName()%>CntInOrg(int orgId) - { - if (orgId == 0) - { - return _repository.Find(null).Count(); - } - else - { - return _repository.Get<%=GetModelName()%>CntInOrgs(GetSubOrgIds(orgId)); - } - } - - public List<<%=GetModelName()%>> LoadAll() - { - return _repository.Find(null).ToList(); - } - - /// - /// 加载一个节点下面的一个或全部<%=GetModelName()%>s - /// - public dynamic Load(int orgId, int pageindex, int pagesize) - { - IEnumerable<<%=ModuleName%>> <%=ModuleName%>s; - int total = 0; - if (orgId == 0) - { - <%=ModuleName%>s = _repository.Load<%=ModuleName%>s(pageindex, pagesize); - total = _repository.GetCount(); - } - else - { - <%=ModuleName%>s = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId)); - total = _repository.Get<%=ModuleName%>CntInOrgs(orgId); - } - <%if(NeedViewModel){ %> - var <%=ModuleName%>views = new List<<%=ModuleName%>View>(); - foreach (var <%=ModuleName%> in <%=ModuleName%>s) - { - <%=ModuleName%>View uv = <%=ModuleName%>; - uv.Organizations = string.Join(",", _orgRepository.LoadBy<%=ModuleName%>(<%=ModuleName%>.Id).Select(u => u.Name).ToList()); - <%=ModuleName%>views.Add(uv); - } - <%} %> - - return new - { - total = total, - list = <%=GetModelName()%>s, - pageCurrent = pageindex - }; - } - - /// - /// 获取当前节点的所有下级节点 - /// - private int[] GetSubOrgIds(int orgId) - { - var org = _orgRepository.FindSingle(u => u.Id == orgId); - var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray(); - return orgs; - } - - public <%=GetModelName()%> Find(int id) - { - var <%=ModuleName.ToLower()%> = _repository.FindSingle(u => u.Id == id); - if (<%=ModuleName.ToLower()%> == null) return new <%=GetModelName()%>(); - - return <%=ModuleName.ToLower() %>; - } - - public void Delete(int id) - { - _repository.Delete(id); - } - - public void AddOrUpdate(<%=GetModelName()%> model) - { - <%=ModuleName%> <%=ModuleName.ToLower()%> = new <%=ModuleName%>(); - model.CopyTo(<%=ModuleName.ToLower()%>); - - if (<%=ModuleName.ToLower()%>.Id == 0) - { - _repository.Add(<%=ModuleName.ToLower()%>); - } - else - { - _repository.Update(<%=ModuleName.ToLower()%>); - } - - } - - - } +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="应用层" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + + +<%if(NeedViewModel){ %> +using OpenAuth.App.ViewModel; +<%} %> +using OpenAuth.Domain; +using OpenAuth.Domain.Interface; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.App +{ + public class <%=ModuleName%>ManagerApp + { + private I<%=ModuleName%>Repository _repository; + private IOrgRepository _orgRepository; + + public <%=ModuleName%>ManagerApp(I<%=ModuleName%>Repository repository, + IOrgRepository orgRepository) + { + _repository = repository; + _orgRepository = orgRepository; + } + + public int Get<%=GetModelName()%>CntInOrg(int orgId) + { + if (orgId == 0) + { + return _repository.Find(null).Count(); + } + else + { + return _repository.Get<%=GetModelName()%>CntInOrgs(GetSubOrgIds(orgId)); + } + } + + public List<<%=GetModelName()%>> LoadAll() + { + return _repository.Find(null).ToList(); + } + + /// + /// 加载一个节点下面的一个或全部<%=GetModelName()%>s + /// + public dynamic Load(int orgId, int pageindex, int pagesize) + { + IEnumerable<<%=ModuleName%>> <%=ModuleName%>s; + int total = 0; + if (orgId == 0) + { + <%=ModuleName%>s = _repository.Load<%=ModuleName%>s(pageindex, pagesize); + total = _repository.GetCount(); + } + else + { + <%=ModuleName%>s = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId)); + total = _repository.Get<%=ModuleName%>CntInOrgs(orgId); + } + <%if(NeedViewModel){ %> + var <%=ModuleName%>views = new List<<%=ModuleName%>View>(); + foreach (var <%=ModuleName%> in <%=ModuleName%>s) + { + <%=ModuleName%>View uv = <%=ModuleName%>; + uv.Organizations = string.Join(",", _orgRepository.LoadBy<%=ModuleName%>(<%=ModuleName%>.Id).Select(u => u.Name).ToList()); + <%=ModuleName%>views.Add(uv); + } + <%} %> + + return new + { + total = total, + list = <%=GetModelName()%>s, + pageCurrent = pageindex + }; + } + + /// + /// 获取当前节点的所有下级节点 + /// + private int[] GetSubOrgIds(int orgId) + { + var org = _orgRepository.FindSingle(u => u.Id == orgId); + var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray(); + return orgs; + } + + public <%=GetModelName()%> Find(int id) + { + var <%=ModuleName.ToLower()%> = _repository.FindSingle(u => u.Id == id); + if (<%=ModuleName.ToLower()%> == null) return new <%=GetModelName()%>(); + + return <%=ModuleName.ToLower() %>; + } + + public void Delete(int id) + { + _repository.Delete(id); + } + + public void AddOrUpdate(<%=GetModelName()%> model) + { + <%=ModuleName%> <%=ModuleName.ToLower()%> = new <%=ModuleName%>(); + model.CopyTo(<%=ModuleName.ToLower()%>); + + if (<%=ModuleName.ToLower()%>.Id == 0) + { + _repository.Add(<%=ModuleName.ToLower()%>); + } + else + { + _repository.Update(<%=ModuleName.ToLower()%>); + } + + } + + + } } \ No newline at end of file diff --git a/CodeSmith/Controller.cst b/CodeSmith/带其他级联/Controller.cst similarity index 96% rename from CodeSmith/Controller.cst rename to CodeSmith/带其他级联/Controller.cst index 6fe89062..6e45e6a8 100644 --- a/CodeSmith/Controller.cst +++ b/CodeSmith/带其他级联/Controller.cst @@ -1,109 +1,110 @@ -<%-- -Name: Database Table Properties -Author: Paul Welter -Description: Create a list of properties from a database table ---%> -<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="控制器" %> -<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> -<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> -<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> -<%@ Assembly Name="SchemaExplorer" %> -<%@ Import Namespace="SchemaExplorer" %> - - -using System; -using System.Web.Mvc; -using Infrastructure; -using OpenAuth.App; -<%if(NeedViewModel){ %> -using OpenAuth.App.ViewModel; -<%} %> - -namespace OpenAuth.Mvc.Controllers -{ - public class <%=ModuleName%>ManagerController : BaseController - { - private <%=ModuleName%>ManagerApp _app; - - public <%=ModuleName%>ManagerController() - { - _app = AutofacExt.GetFromFac<<%=ModuleName%>ManagerApp>(); - } - - // - // GET: /UserManager/ - public ActionResult Index() - { - return View(); - } - - public ActionResult Add(int id = 0) - { - return View(_app.Find(id)); - } - - //添加或修改<%=ModuleName %> - [HttpPost] - public string Add(<%=GetModelName()%> model) - { - try - { - _app.AddOrUpdate(model); - - } - catch (Exception ex) - { - BjuiResponse.statusCode = "300"; - BjuiResponse.message = ex.Message; - } - return JsonHelper.Instance.Serialize(BjuiResponse); - } - - /// - /// 加载节点下面的所有<%=ModuleName %>s - /// - public string Load(int parentidId, int pageCurrent = 1, int pageSize = 30) - { - return JsonHelper.Instance.Serialize(_app.Load(parentidId, pageCurrent, pageSize)); - } - - public string LoadForTree() - { - var models = _app.LoadAll(); - //添加根节点 - models.Add(new <%=ModuleName %> - { - Id = 0, - ParentId = -1, - Name = "根结点", - CascadeId = "0" - }); - return JsonHelper.Instance.Serialize(models); - } - - public string Delete(int Id) - { - try - { - _app.Delete(Id); - } - catch (Exception e) - { - BjuiResponse.statusCode = "300"; - BjuiResponse.message = e.Message; - } - - return JsonHelper.Instance.Serialize(BjuiResponse); - } - - - } +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="控制器" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + + +using System; +using System.Web.Mvc; +using Infrastructure; +using OpenAuth.App; +<%if(NeedViewModel){ %> +using OpenAuth.App.ViewModel; +<%} %> +using OpenAuth.Domain; + +namespace OpenAuth.Mvc.Controllers +{ + public class <%=ModuleName%>ManagerController : BaseController + { + private <%=ModuleName%>ManagerApp _app; + + public <%=ModuleName%>ManagerController() + { + _app = AutofacExt.GetFromFac<<%=ModuleName%>ManagerApp>(); + } + + // + // GET: /UserManager/ + public ActionResult Index() + { + return View(); + } + + public ActionResult Add(int id = 0) + { + return View(_app.Find(id)); + } + + //添加或修改<%=ModuleName %> + [HttpPost] + public string Add(<%=GetModelName()%> model) + { + try + { + _app.AddOrUpdate(model); + + } + catch (Exception ex) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = ex.Message; + } + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + /// + /// 加载节点下面的所有<%=ModuleName %>s + /// + public string Load(int parentidId, int pageCurrent = 1, int pageSize = 30) + { + return JsonHelper.Instance.Serialize(_app.Load(parentidId, pageCurrent, pageSize)); + } + + public string LoadForTree() + { + var models = _app.LoadAll(); + //添加根节点 + models.Add(new <%=ModuleName %> + { + Id = 0, + ParentId = -1, + Name = "根结点", + CascadeId = "0" + }); + return JsonHelper.Instance.Serialize(models); + } + + public string Delete(int Id) + { + try + { + _app.Delete(Id); + } + catch (Exception e) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = e.Message; + } + + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + + } } \ No newline at end of file diff --git a/CodeSmith/IRepository.cst b/CodeSmith/带其他级联/IRepository.cst similarity index 97% rename from CodeSmith/IRepository.cst rename to CodeSmith/带其他级联/IRepository.cst index 4be8b648..4e1ec96c 100644 --- a/CodeSmith/IRepository.cst +++ b/CodeSmith/带其他级联/IRepository.cst @@ -1,28 +1,28 @@ -<%-- -Name: Database Table Properties -Author: Paul Welter -Description: Create a list of properties from a database table ---%> -<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="创建包含组织机构的接口" %> -<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> -<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> -<%@ Assembly Name="SchemaExplorer" %> -<%@ Import Namespace="SchemaExplorer" %> - -using System.Collections.Generic; -using System.Linq; - -namespace OpenAuth.Domain.Interface -{ - public interface I<%=ModuleName%>Repository :IRepository<<%=ModuleName%>> - { - IEnumerable<<%=ModuleName%>> Load<%=ModuleName%>s(int pageindex, int pagesize); - - IEnumerable<<%=ModuleName%>> LoadInOrgs(params int[] orgId); - int Get<%=ModuleName%>CntInOrgs(params int[] orgIds); - IEnumerable<<%=ModuleName%>> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds); - - void Delete(int id); - - } +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="创建包含组织机构的接口" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.Domain.Interface +{ + public interface I<%=ModuleName%>Repository :IRepository<<%=ModuleName%>> + { + IEnumerable<<%=ModuleName%>> Load<%=ModuleName%>s(int pageindex, int pagesize); + + IEnumerable<<%=ModuleName%>> LoadInOrgs(params int[] orgId); + int Get<%=ModuleName%>CntInOrgs(params int[] orgIds); + IEnumerable<<%=ModuleName%>> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds); + + void Delete(int id); + + } } \ No newline at end of file diff --git a/CodeSmith/Index.cshtml.cst b/CodeSmith/带其他级联/Index.cshtml.cst similarity index 97% rename from CodeSmith/Index.cshtml.cst rename to CodeSmith/带其他级联/Index.cshtml.cst index f3d1d099..a674c30a 100644 --- a/CodeSmith/Index.cshtml.cst +++ b/CodeSmith/带其他级联/Index.cshtml.cst @@ -1,148 +1,148 @@ -<%-- -Name: Database Table Properties -Author: Paul Welter -Description: Create a list of properties from a database table ---%> -<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="True" Description="Create a list of properties from database table." %> -<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context" Description="Table that the object is based on." %> -<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> -<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> -<%@ Assembly Name="SchemaExplorer" %> -<%@ Import Namespace="SchemaExplorer" %> - -@{ - string _prefix = "<%=ModuleName%>"; - var _treeId = _prefix + "Tree"; - var _gridId = _prefix + "Grid"; - var _treeDetail = _prefix + "Detail"; -} - -@{ Html.RenderAction("MenuHeader", "Home");} -
      -
      -
      -
        -
        - -
        -
        -
        -
        - - - +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="True" Description="Create a list of properties from database table." %> +<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context" Description="Table that the object is based on." %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + +@{ + string _prefix = "<%=ModuleName%>"; + var _treeId = _prefix + "Tree"; + var _gridId = _prefix + "Grid"; + var _treeDetail = _prefix + "Detail"; +} + +@{ Html.RenderAction("MenuHeader", "Home");} +
        +
        +
        +
          +
          + +
          +
          +
          +
          + + + diff --git a/CodeSmith/本身带级联/Add.cshtml.cst b/CodeSmith/本身带级联/Add.cshtml.cst new file mode 100644 index 00000000..5b4f093e --- /dev/null +++ b/CodeSmith/本身带级联/Add.cshtml.cst @@ -0,0 +1,145 @@ +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" TargetLanguage="C#" Debug="False" Encoding="utf-8" Description="添加模块" %> +<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context" +Description="连接的数据库" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> +<%@ Property Name="CascadeId" Type="String" Category="" Default="ParentId" Description="级联字段" %> +<%@ Property Name="CascadeName" Type="String" Category="" Default="ParentName" Description="级联显示的文字" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + +<%if(NeedViewModel){ %> +@model OpenAuth.App.ViewModel.<%=GetModelName()%> +<%} else{ %> +@model OpenAuth.Domain.<%=GetModelName()%> +<%} %> +@{ + ViewBag.Title = "<%=GetModelName()%>编辑界面"; + Layout = null; +} + +
          +
          + + + <% foreach (ColumnSchema column in this.SourceTable.Columns) { + if(column.Name == CascadeName) continue; + %> + + + + <% } %> + +
          + <%if(column.IsPrimaryKeyMember){ %> + @Html.HiddenFor(m =>m.Id) + <% } else if(column.Name == CascadeId) {%> + + + +
            + + <% } else if(CSharpAlias[column.SystemType.FullName] == "bool") {%> + + + + <%} else if(CSharpAlias[column.SystemType.FullName] == "int") {%> + + + <%} else{%> + + + <%} %> +
            +
            +
            +
            + +
            + + \ No newline at end of file diff --git a/CodeSmith/本身带级联/Application.cst b/CodeSmith/本身带级联/Application.cst new file mode 100644 index 00000000..d6120175 --- /dev/null +++ b/CodeSmith/本身带级联/Application.cst @@ -0,0 +1,138 @@ +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="应用层" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + + +<%if(NeedViewModel){ %> +using OpenAuth.App.ViewModel; +<%} %> +using OpenAuth.Domain; +using OpenAuth.Domain.Interface; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.App +{ + public class <%=ModuleName%>ManagerApp + { + private I<%=ModuleName%>Repository _repository; + private IOrgRepository _orgRepository; + + public <%=ModuleName%>ManagerApp(I<%=ModuleName%>Repository repository, + IOrgRepository orgRepository) + { + _repository = repository; + _orgRepository = orgRepository; + } + + public int Get<%=GetModelName()%>CntInOrg(int orgId) + { + if (orgId == 0) + { + return _repository.Find(null).Count(); + } + else + { + return _repository.Get<%=GetModelName()%>CntInOrgs(GetSubOrgIds(orgId)); + } + } + + public List<<%=GetModelName()%>> LoadAll() + { + return _repository.Find(null).ToList(); + } + + /// + /// 加载一个节点下面的一个或全部<%=GetModelName()%>s + /// + public dynamic Load(int orgId, int pageindex, int pagesize) + { + IEnumerable<<%=ModuleName%>> <%=ModuleName%>s; + int total = 0; + if (orgId == 0) + { + <%=ModuleName%>s = _repository.Load<%=ModuleName%>s(pageindex, pagesize); + total = _repository.GetCount(); + } + else + { + <%=ModuleName%>s = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId)); + total = _repository.Get<%=ModuleName%>CntInOrgs(orgId); + } + <%if(NeedViewModel){ %> + var <%=ModuleName%>views = new List<<%=ModuleName%>View>(); + foreach (var <%=ModuleName%> in <%=ModuleName%>s) + { + <%=ModuleName%>View uv = <%=ModuleName%>; + uv.Organizations = string.Join(",", _orgRepository.LoadBy<%=ModuleName%>(<%=ModuleName%>.Id).Select(u => u.Name).ToList()); + <%=ModuleName%>views.Add(uv); + } + <%} %> + + return new + { + total = total, + list = <%=GetModelName()%>s, + pageCurrent = pageindex + }; + } + + /// + /// 获取当前节点的所有下级节点 + /// + private int[] GetSubOrgIds(int orgId) + { + var org = _orgRepository.FindSingle(u => u.Id == orgId); + var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray(); + return orgs; + } + + public <%=GetModelName()%> Find(int id) + { + var <%=ModuleName.ToLower()%> = _repository.FindSingle(u => u.Id == id); + if (<%=ModuleName.ToLower()%> == null) return new <%=GetModelName()%>(); + + return <%=ModuleName.ToLower() %>; + } + + public void Delete(int id) + { + _repository.Delete(id); + } + + public void AddOrUpdate(<%=GetModelName()%> model) + { + <%=ModuleName%> <%=ModuleName.ToLower()%> = new <%=ModuleName%>(); + model.CopyTo(<%=ModuleName.ToLower()%>); + + if (<%=ModuleName.ToLower()%>.Id == 0) + { + _repository.Add(<%=ModuleName.ToLower()%>); + } + else + { + _repository.Update(<%=ModuleName.ToLower()%>); + } + + } + + + } +} \ No newline at end of file diff --git a/CodeSmith/本身带级联/Controller.cst b/CodeSmith/本身带级联/Controller.cst new file mode 100644 index 00000000..6e45e6a8 --- /dev/null +++ b/CodeSmith/本身带级联/Controller.cst @@ -0,0 +1,110 @@ +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="控制器" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + + +using System; +using System.Web.Mvc; +using Infrastructure; +using OpenAuth.App; +<%if(NeedViewModel){ %> +using OpenAuth.App.ViewModel; +<%} %> +using OpenAuth.Domain; + +namespace OpenAuth.Mvc.Controllers +{ + public class <%=ModuleName%>ManagerController : BaseController + { + private <%=ModuleName%>ManagerApp _app; + + public <%=ModuleName%>ManagerController() + { + _app = AutofacExt.GetFromFac<<%=ModuleName%>ManagerApp>(); + } + + // + // GET: /UserManager/ + public ActionResult Index() + { + return View(); + } + + public ActionResult Add(int id = 0) + { + return View(_app.Find(id)); + } + + //添加或修改<%=ModuleName %> + [HttpPost] + public string Add(<%=GetModelName()%> model) + { + try + { + _app.AddOrUpdate(model); + + } + catch (Exception ex) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = ex.Message; + } + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + /// + /// 加载节点下面的所有<%=ModuleName %>s + /// + public string Load(int parentidId, int pageCurrent = 1, int pageSize = 30) + { + return JsonHelper.Instance.Serialize(_app.Load(parentidId, pageCurrent, pageSize)); + } + + public string LoadForTree() + { + var models = _app.LoadAll(); + //添加根节点 + models.Add(new <%=ModuleName %> + { + Id = 0, + ParentId = -1, + Name = "根结点", + CascadeId = "0" + }); + return JsonHelper.Instance.Serialize(models); + } + + public string Delete(int Id) + { + try + { + _app.Delete(Id); + } + catch (Exception e) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = e.Message; + } + + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + + } +} \ No newline at end of file diff --git a/CodeSmith/本身带级联/IRepository.cst b/CodeSmith/本身带级联/IRepository.cst new file mode 100644 index 00000000..4e1ec96c --- /dev/null +++ b/CodeSmith/本身带级联/IRepository.cst @@ -0,0 +1,28 @@ +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="创建包含组织机构的接口" %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.Domain.Interface +{ + public interface I<%=ModuleName%>Repository :IRepository<<%=ModuleName%>> + { + IEnumerable<<%=ModuleName%>> Load<%=ModuleName%>s(int pageindex, int pagesize); + + IEnumerable<<%=ModuleName%>> LoadInOrgs(params int[] orgId); + int Get<%=ModuleName%>CntInOrgs(params int[] orgIds); + IEnumerable<<%=ModuleName%>> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds); + + void Delete(int id); + + } +} \ No newline at end of file diff --git a/CodeSmith/本身带级联/Index.cshtml.cst b/CodeSmith/本身带级联/Index.cshtml.cst new file mode 100644 index 00000000..a674c30a --- /dev/null +++ b/CodeSmith/本身带级联/Index.cshtml.cst @@ -0,0 +1,148 @@ +<%-- +Name: Database Table Properties +Author: Paul Welter +Description: Create a list of properties from a database table +--%> +<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="True" Description="Create a list of properties from database table." %> +<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context" Description="Table that the object is based on." %> +<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %> +<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %> +<%@ Assembly Name="SchemaExplorer" %> +<%@ Import Namespace="SchemaExplorer" %> + +@{ + string _prefix = "<%=ModuleName%>"; + var _treeId = _prefix + "Tree"; + var _gridId = _prefix + "Grid"; + var _treeDetail = _prefix + "Detail"; +} + +@{ Html.RenderAction("MenuHeader", "Home");} +
            +
            +
            +
              +
              + +
              +
              +
              +
              + + + diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index 5ec499cd..85d85cc9 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -47,6 +47,7 @@ + diff --git a/OpenAuth.App/ResourceManagerApp.cs b/OpenAuth.App/ResourceManagerApp.cs new file mode 100644 index 00000000..70c5b934 --- /dev/null +++ b/OpenAuth.App/ResourceManagerApp.cs @@ -0,0 +1,107 @@ + +using OpenAuth.Domain; +using OpenAuth.Domain.Interface; +using System; +using System.Collections.Generic; +using System.Linq; +using Infrastructure; + +namespace OpenAuth.App +{ + public class ResourceManagerApp + { + private IResourceRepository _repository; + private readonly ICategoryRepository _categoryRepository; + + public ResourceManagerApp(IResourceRepository repository, + ICategoryRepository categoryRepository) + { + _repository = repository; + _categoryRepository = categoryRepository; + } + + public int GetResourceCntInOrg(int orgId) + { + if (orgId == 0) + { + return _repository.Find(null).Count(); + } + else + { + return _repository.GetResourceCntInOrgs(GetSubOrgIds(orgId)); + } + } + + public List LoadAll() + { + return _repository.Find(null).ToList(); + } + + /// + /// 加载一个节点下面的一个或全部Resources + /// + public dynamic Load(int categoryId, int pageindex, int pagesize) + { + IEnumerable Resources; + int total = 0; + if (categoryId == 0) + { + Resources = _repository.LoadResources(pageindex, pagesize); + total = _repository.GetCount(); + } + else + { + Resources = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(categoryId)); + total = _repository.GetResourceCntInOrgs(categoryId); + } + + return new + { + total = total, + list = Resources, + pageCurrent = pageindex + }; + } + + /// + /// 获取当前节点的所有下级节点 + /// + private int[] GetSubOrgIds(int orgId) + { + var org = _categoryRepository.FindSingle(u => u.Id == orgId); + var orgs = _categoryRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray(); + return orgs; + } + + public Resource Find(int id) + { + var resource = _repository.FindSingle(u => u.Id == id); + if (resource == null) return new Resource(); + + return resource; + } + + public void Delete(int id) + { + _repository.Delete(id); + } + + public void AddOrUpdate(Resource model) + { + Resource resource = new Resource(); + model.CopyTo(resource); + + if (resource.Id == 0) + { + _repository.Add(resource); + } + else + { + _repository.Update(resource); + } + + } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Domain/Interface/IResourceRepository.cs b/OpenAuth.Domain/Interface/IResourceRepository.cs new file mode 100644 index 00000000..540daf00 --- /dev/null +++ b/OpenAuth.Domain/Interface/IResourceRepository.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using System.Linq; + +namespace OpenAuth.Domain.Interface +{ + public interface IResourceRepository :IRepository + { + IEnumerable LoadResources(int pageindex, int pagesize); + + IEnumerable LoadInOrgs(params int[] orgId); + int GetResourceCntInOrgs(params int[] orgIds); + IEnumerable LoadInOrgs(int pageindex, int pagesize, params int[] orgIds); + + void Delete(int id); + + } +} \ No newline at end of file diff --git a/OpenAuth.Domain/OpenAuth.Domain.csproj b/OpenAuth.Domain/OpenAuth.Domain.csproj index 510ab64f..cd91bf56 100644 --- a/OpenAuth.Domain/OpenAuth.Domain.csproj +++ b/OpenAuth.Domain/OpenAuth.Domain.csproj @@ -50,6 +50,7 @@ + diff --git a/OpenAuth.Mvc/Controllers/ResourceManagerController.cs b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs new file mode 100644 index 00000000..b521f6a2 --- /dev/null +++ b/OpenAuth.Mvc/Controllers/ResourceManagerController.cs @@ -0,0 +1,87 @@ + +using System; +using System.Web.Mvc; +using Infrastructure; +using OpenAuth.App; +using OpenAuth.Domain; + +namespace OpenAuth.Mvc.Controllers +{ + public class ResourceManagerController : BaseController + { + private ResourceManagerApp _app; + + public ResourceManagerController() + { + _app = AutofacExt.GetFromFac(); + } + + // + // GET: /UserManager/ + public ActionResult Index() + { + return View(); + } + + public ActionResult Add(int id = 0) + { + return View(_app.Find(id)); + } + + //添加或修改Resource + [HttpPost] + public string Add(Resource model) + { + try + { + _app.AddOrUpdate(model); + + } + catch (Exception ex) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = ex.Message; + } + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + /// + /// 加载某分类的所有Resources + /// + public string Load(int categoryId, int pageCurrent = 1, int pageSize = 30) + { + return JsonHelper.Instance.Serialize(_app.Load(categoryId, pageCurrent, pageSize)); + } + + public string LoadForTree() + { + var models = _app.LoadAll(); + //添加根节点 + models.Add(new Resource + { + Id = 0, + ParentId = -1, + Name = "根结点", + CascadeId = "0" + }); + return JsonHelper.Instance.Serialize(models); + } + + public string Delete(int Id) + { + try + { + _app.Delete(Id); + } + catch (Exception e) + { + BjuiResponse.statusCode = "300"; + BjuiResponse.message = e.Message; + } + + return JsonHelper.Instance.Serialize(BjuiResponse); + } + + + } +} \ No newline at end of file diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj index 6a66c47f..3f75f336 100644 --- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj +++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj @@ -133,6 +133,7 @@ + @@ -571,6 +572,8 @@ + + diff --git a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml index 9905e9da..7dfbb569 100644 --- a/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml +++ b/OpenAuth.Mvc/Views/CategoryManager/Index.cshtml @@ -54,9 +54,6 @@ name: 'ParentId', label: '父节点流水号', width: 100 - ,type: 'select', - align: 'center', - items: [{ '0': '默认' }, { '1': '状态1' }], }, { name: 'Status', diff --git a/OpenAuth.Mvc/Views/ResourceManager/Add.cshtml b/OpenAuth.Mvc/Views/ResourceManager/Add.cshtml new file mode 100644 index 00000000..18cd0a91 --- /dev/null +++ b/OpenAuth.Mvc/Views/ResourceManager/Add.cshtml @@ -0,0 +1,152 @@ +@model OpenAuth.Domain.Resource +@{ + ViewBag.Title = "Resource编辑界面"; + Layout = null; +} + +
              +
              + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              + @Html.HiddenFor(m =>m.Id) +
              + + +
              + + +
              + + +
              + + + +
                + +
                + + +
                + + +
                + + +
                + + +
                +
                +
                +
                +
                  +
                  • +
                  • +
                +
                + + \ No newline at end of file diff --git a/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml new file mode 100644 index 00000000..ee4098d1 --- /dev/null +++ b/OpenAuth.Mvc/Views/ResourceManager/Index.cshtml @@ -0,0 +1,170 @@ +@{ + string _prefix = "Resource"; + var _treeId = _prefix + "Tree"; + var _gridId = _prefix + "Grid"; + var _treeDetail = _prefix + "Detail"; +} + +@{ Html.RenderAction("MenuHeader", "Home");} +
                +
                +
                +
                  +
                  + +
                  +
                  +
                  +
                  + + + diff --git a/OpenAuth.Repository/OpenAuth.Repository.csproj b/OpenAuth.Repository/OpenAuth.Repository.csproj index d9f1f7c2..d82d7ce5 100644 --- a/OpenAuth.Repository/OpenAuth.Repository.csproj +++ b/OpenAuth.Repository/OpenAuth.Repository.csproj @@ -71,6 +71,7 @@ + diff --git a/OpenAuth.Repository/ResourceRepository.cs b/OpenAuth.Repository/ResourceRepository.cs new file mode 100644 index 00000000..d57977cd --- /dev/null +++ b/OpenAuth.Repository/ResourceRepository.cs @@ -0,0 +1,41 @@ +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 RoleRepository :BaseRepository, IRoleRepository + { + public IEnumerable LoadRoles(int pageindex, int pagesize) + { + return Context.Roles.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize); + } + + public int GetRoleCntInOrgs(params int[] orgIds) + { + return LoadInOrgs(orgIds).Count(); + } + + public IEnumerable LoadInOrgs(int pageindex, int pagesize, params int[] orgIds) + { + return LoadInOrgs(orgIds).OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize); + } + + public void Delete(int id) + { + Delete(u =>u.Id == id); + } + + public IEnumerable LoadInOrgs(params int[] orgId) + { + var result = from role in Context.Roles.Where(u => orgId.Contains(u.OrgId)) select role; + + return result; + + } + } +} diff --git a/OpenAuth.Repository/RoleRepository.cs b/OpenAuth.Repository/RoleRepository.cs index b72cc005..f414ddeb 100644 --- a/OpenAuth.Repository/RoleRepository.cs +++ b/OpenAuth.Repository/RoleRepository.cs @@ -1,41 +1,37 @@ -using System; +using OpenAuth.Domain; +using OpenAuth.Domain.Interface; 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 RoleRepository :BaseRepository, IRoleRepository + public class ResourceRepository : BaseRepository, IResourceRepository { - public IEnumerable LoadRoles(int pageindex, int pagesize) - { - return Context.Roles.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize); - } - - public int GetRoleCntInOrgs(params int[] orgIds) - { - return LoadInOrgs(orgIds).Count(); - } - - public IEnumerable LoadInOrgs(int pageindex, int pagesize, params int[] orgIds) + public IEnumerable LoadInOrgs(int pageindex, int pagesize, params int[] orgIds) { return LoadInOrgs(orgIds).OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize); } public void Delete(int id) { - Delete(u =>u.Id == id); + Delete(u => u.Id == id); } - public IEnumerable LoadInOrgs(params int[] orgId) + public IEnumerable LoadInOrgs(params int[] orgId) { - var result = from role in Context.Roles.Where(u => orgId.Contains(u.OrgId)) select role; - - return result; + var result = from resource in Context.Resources.Where(u => orgId.Contains(u.CategoryId)) select resource; + return result; + } + + public IEnumerable LoadResources(int pageindex, int pagesize) + { + return Context.Resources.OrderBy(u => u.Id).Skip((pageindex - 1) * pagesize).Take(pagesize); + } + + public int GetResourceCntInOrgs(params int[] orgIds) + { + return LoadInOrgs(orgIds).Count(); } } -} +} \ No newline at end of file diff --git a/建表&初始化数据.sql b/建表&初始化数据.sql index 8dc0777c420443fef71677aa344d829d8d9caa41..db61168f3c45db94126df94618a636a7e3246c0d 100644 GIT binary patch delta 8363 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 delta 8479 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