diff --git a/CodeSmith/CSharp/ApiGenerate.cst b/CodeSmith/CSharp/ApiGenerate.cst
new file mode 100644
index 0000000000000000000000000000000000000000..9d201f29cef79c89e77c818dadfe5f92f9a0c1f4
--- /dev/null
+++ b/CodeSmith/CSharp/ApiGenerate.cst
@@ -0,0 +1,226 @@
+<%--
+Author: yubaolee
+Description: 用于生成OpenAuth.WebApi接口相关代码，包括controller/app/实体/dbcontext
+--%>
+<%@ Template Language="C#" TargetLanguage="Text" Debug="True" OutputType="Normal" %>
+
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Assembly Name="CodeSmith.CustomProperties" %>
+
+<%@ Assembly Name="Mono.Cecil" Path="..\Common" %>
+<%@ Assembly Name="ICSharpCode.NRefactory" Path="..\Common" %>
+<%@ Assembly Name="ICSharpCode.NRefactory.CSharp" Path="..\Common" %>
+
+<%@ Assembly Src="Internal\Model.cs" %>
+<%@ Assembly Src="Internal\Extensions.cs" %>
+<%@ Assembly Src="Internal\Generator.cs" %>
+<%@ Assembly Src="Internal\Parser.cs" %>
+
+<%@ Import Namespace="System.Collections.Generic" %>
+<%@ Import Namespace="System.IO" %>
+<%@ Import Namespace="System.Linq" %>
+<%@ Import Namespace="System.Text" %>
+<%@ Import Namespace="System.Text.RegularExpressions" %>
+<%@ Import Namespace="System.Diagnostics" %>
+
+<%@ Import Namespace="SchemaMapper" %>
+
+<%@ Property Name="WholeDb"
+Type="System.Boolean"
+Category="1.Database"
+Default="true"
+Description="是否直接生成选定数据库中的所有表" %>
+
+<%@ Property Name="HeaderModel"
+Type="System.Boolean"
+Category="1.Database"
+Default="true"
+Description="是否为启用头表模式，即类似‘入库订单’界面" %>
+
+<%@ Property Name="SourceDatabase"
+ Type="SchemaExplorer.DatabaseSchema"
+ Category="1.Database"
+ Description="The source database." %>
+
+<%@ Property Name="SourceTables"
+Type="SchemaExplorer.TableSchemaCollection"
+Category="1.Database" Description="可以选择一个或多个表（使用Ctrl键）" %>
+
+<%@ Property Name="directory"
+ Type="System.String"
+ Default=".\"
+ Optional="True"
+ Description="代码生成路径"
+ Editor="System.Windows.Forms.Design.FolderNameEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" %>
+
+<%@ Property Name="ContextNamespace"
+ Type="System.String"
+ Category="2.Class"
+ Default="OpenAuth.Repository"
+ OnChanged="OnContextNamespaceChanged"
+ Description="DbContext默认命名空间，尽量不要更改"%>
+<%@ Property Name="EntityNamespace"
+ Type="System.String"
+ Default="OpenAuth.Repository.Domain"
+ Category="2.Class"
+ Description="实体默认命名空间，尽量不要更改"%>
+
+
+<%@ Register Name="EntityGeneratedClass"
+ Template="Internal\Entity.Generated.cst"
+ MergeProperties="False" %>
+
+<%@ Register Name="ContextGeneratedClass"
+ Template="Internal\Context.Generated.cst"
+ MergeProperties="True" %>
+
+<%@ Register Name="ApplicationGenerateClass"
+ Template="ApiGenerate\Application.cst"
+ MergeProperties="False" %>
+<%@ Register Name="RequestGenerateClass"
+ Template="ApiGenerate\Request.cst"
+ MergeProperties="False" %>
+<%@ Register Name="ModifyReqGenerateClass"
+ Template="ApiGenerate\ModifyReq.cst"
+ MergeProperties="False" %>
+<%@ Register Name="ControllerGenerateClass"
+ Template="ApiGenerate\Controller.cst"
+ MergeProperties="False" %>
+
+开始创建OpenAuth.Core WebApi相关代码 ...
+<% Generate(); %>
+
+
\ No newline at end of file
diff --git a/CodeSmith/CSharp/ApiGenerate/Application.cst b/CodeSmith/CSharp/ApiGenerate/Application.cst
new file mode 100644
index 0000000000000000000000000000000000000000..28689ccbd24029ff011a31e8d34606ebf51fd02c
--- /dev/null
+++ b/CodeSmith/CSharp/ApiGenerate/Application.cst
@@ -0,0 +1,185 @@
+<%--
+Name: Database Table Properties
+Author: yubaolee
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="True" Description="应用层" %>
+<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Import Namespace="SchemaExplorer" %>
+<%@ Property Name="Table"
+ Type="SchemaExplorer.TableSchema" %>
+
+<%@ Property Name="HeaderModel"
+Type="System.Boolean"
+Category="1.Database"
+Default="true"
+Description="是否为启用头表模式，即类似‘入库订单’界面" %>
+
+using System;
+using System.Linq;
+using Infrastructure;
+using OpenAuth.App.Interface;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository.Domain;
+using OpenAuth.Repository.Interface;
+
+
+namespace OpenAuth.App
+{
+ public class <%=Table.Name%>App : BaseApp<<%=Table.Name%>>
+ {
+ private RevelanceManagerApp _revelanceApp;
+
+ ///
+ /// 加载列表
+ ///
+ public TableData Load(Query<%=Table.Name%>ListReq request)
+ {
+ var loginContext = _auth.GetCurrentUser();
+ if (loginContext == null)
+ {
+ throw new CommonException("登录已过期", Define.INVALID_TOKEN);
+ }
+
+ var properties = loginContext.GetProperties("<%=Table.Name%>");
+
+ if (properties == null || properties.Count == 0)
+ {
+ throw new Exception("当前登录用户没有访问该模块字段的权限，请联系管理员配置");
+ }
+
+
+ var result = new TableData();
+ var objs = UnitWork.Find<<%=Table.Name%>>(null);
+ if (!string.IsNullOrEmpty(request.key))
+ {
+ objs = objs.Where(u => u.Id.Contains(request.key));
+ }
+
+
+ var propertyStr = string.Join(',', properties.Select(u => u.Key));
+ result.columnHeaders = properties;
+ result.data = objs.OrderBy(u => u.Id)
+ .Skip((request.page - 1) * request.limit)
+ .Take(request.limit).Select($"new ({propertyStr})");
+ result.count = objs.Count();
+ return result;
+ }
+
+ <%
+ if(Table.Name.Contains("Tbl") && (!Table.Name.Contains("Dtbl")) && this.HeaderModel){
+ var dtblName = Table.Name.Replace("Tbl","Dtbl"); //明细表的表名
+ %>
+
+ public void Add(AddOrUpdate<%=Table.Name%>Req req)
+ {
+ var obj = req.MapTo<<%=Table.Name%>>();
+ //todo:补充或调整自己需要的字段
+ obj.CreateTime = DateTime.Now;
+ var user = _auth.GetCurrentUser().User;
+ obj.CreateUserId = user.Id;
+ obj.CreateUserName = user.Name;
+ UnitWork.Add(obj);
+ if (req.<%=dtblName%>Reqs != null && req.<%=dtblName%>Reqs.Any())
+ {
+ foreach (var detail in req.<%=dtblName%>Reqs)
+ {
+ detail.ForeignKeyId = obj.Id; //todo:调整自己的明细表外键
+ _<%=dtblName%>App.AddNoSave(detail);
+ }
+ }
+
+ UnitWork.Save();
+ }
+
+ public void Update(AddOrUpdate<%=Table.Name%>Req obj)
+ {
+ var user = _auth.GetCurrentUser().User;
+
+ if (obj.<%=dtblName%>Reqs != null && obj.<%=dtblName%>Reqs.Any())
+ {
+ //id为空的添加
+ foreach (var detail in obj.<%=dtblName%>Reqs.Where(u =>string.IsNullOrEmpty(u.Id)))
+ {
+ detail.ForeignKeyId = obj.Id; //todo:调整自己的明细表外键
+ _<%=dtblName%>App.AddNoSave(detail);
+ }
+
+ //id比数据库少的，删除
+ var containids = obj.<%=dtblName%>Reqs.Select(u => u.Id)
+ .Where(u =>!string.IsNullOrEmpty(u)).ToList();
+ if (containids.Any())
+ {
+ UnitWork.Delete<<%=dtblName%>>(u =>(!containids.Contains(u.Id)) && u.ForeignKeyId == obj.Id); //todo:调整自己的明细表外键
+ }
+
+
+ //更新id相同的
+ foreach (var detail in obj.<%=dtblName%>Reqs.Where(u =>!string.IsNullOrEmpty(u.Id)))
+ {
+ _<%=dtblName%>App.Update(detail);
+ }
+ }
+
+ UnitWork.Update<<%=Table.Name%>>(u => u.Id == obj.Id, u => new <%=Table.Name%>
+ {
+ <% foreach(ColumnSchema p in Table.Columns) {
+ if(p.IsPrimaryKeyMember) continue;
+ %>
+ <%= p.Name%> = obj.<%= p.Name%>,
+ <% } %>
+ UpdateTime = DateTime.Now,
+ UpdateUserId = user.Id,
+ UpdateUserName = user.Name
+ //todo:补充或调整自己需要的字段
+ });
+
+ UnitWork.Save();
+
+ }
+
+
+ <%
+ }else{ %>
+ public void Add(AddOrUpdate<%=Table.Name%>Req req)
+ {
+ var obj = req.MapTo<<%=Table.Name%>>();
+ //todo:补充或调整自己需要的字段
+ obj.CreateTime = DateTime.Now;
+ var user = _auth.GetCurrentUser().User;
+ obj.CreateUserId = user.Id;
+ obj.CreateUserName = user.Name;
+ Repository.Add(obj);
+ }
+
+ public void Update(AddOrUpdate<%=Table.Name%>Req obj)
+ {
+ var user = _auth.GetCurrentUser().User;
+ UnitWork.Update<<%=Table.Name%>>(u => u.Id == obj.Id, u => new <%=Table.Name%>
+ {
+ <% foreach(ColumnSchema p in Table.Columns) {
+ if(p.IsPrimaryKeyMember) continue;
+ %>
+ <%= p.Name%> = obj.<%= p.Name%>,
+ <% } %>
+ UpdateTime = DateTime.Now,
+ UpdateUserId = user.Id,
+ UpdateUserName = user.Name
+ //todo:补充或调整自己需要的字段
+ });
+
+ }
+
+ <%
+ }
+ %>
+
+ public <%=Table.Name%>App(IUnitWork unitWork, IRepository<<%=Table.Name%>> repository,
+ RevelanceManagerApp app, IAuth auth) : base(unitWork, repository,auth)
+ {
+ _revelanceApp = app;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CodeSmith/CSharp/ApiGenerate/Controller.cst b/CodeSmith/CSharp/ApiGenerate/Controller.cst
new file mode 100644
index 0000000000000000000000000000000000000000..fdfb966f1f76b0e50c580350e7951bdc5c26a3dd
--- /dev/null
+++ b/CodeSmith/CSharp/ApiGenerate/Controller.cst
@@ -0,0 +1,122 @@
+<%--
+Name: Database Table Properties
+Author: yubaolee
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="True" 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;
+using Infrastructure;
+using Microsoft.AspNetCore.Mvc;
+using OpenAuth.App;
+using OpenAuth.App.Request;
+using OpenAuth.App.Response;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.WebApi.Controllers
+{
+ ///
+ /// <%=ModuleName%>操作
+ ///
+ [Route("api/[controller]/[action]")]
+ [ApiController]
+ public class <%=ModuleName%>sController : ControllerBase
+ {
+ private readonly <%=ModuleName%>App _app;
+
+ //获取详情
+ [HttpGet]
+ public Response<<%=ModuleName%>> Get(string id)
+ {
+ var result = new Response<<%=ModuleName%>>();
+ try
+ {
+ result.Result = _app.Get(id);
+ }
+ catch (Exception ex)
+ {
+ result.Code = 500;
+ result.Message = ex.InnerException?.Message ?? ex.Message;
+ }
+
+ return result;
+ }
+
+ //添加
+ [HttpPost]
+ public Response Add(AddOrUpdate<%=ModuleName%>Req obj)
+ {
+ var result = new Response();
+ try
+ {
+ _app.Add(obj);
+
+ }
+ catch (Exception ex)
+ {
+ result.Code = 500;
+ result.Message = ex.InnerException?.Message ?? ex.Message;
+ }
+
+ return result;
+ }
+
+ //修改
+ [HttpPost]
+ public Response Update(AddOrUpdate<%=ModuleName%>Req obj)
+ {
+ var result = new Response();
+ try
+ {
+ _app.Update(obj);
+
+ }
+ catch (Exception ex)
+ {
+ result.Code = 500;
+ result.Message = ex.InnerException?.Message ?? ex.Message;
+ }
+
+ return result;
+ }
+
+ ///
+ /// 加载列表
+ ///
+ [HttpGet]
+ public TableData Load([FromQuery]Query<%=ModuleName%>ListReq request)
+ {
+ return _app.Load(request);
+ }
+
+ ///
+ /// 批量删除
+ ///
+ [HttpPost]
+ public Response Delete([FromBody]string[] ids)
+ {
+ var result = new Response();
+ try
+ {
+ _app.Delete(ids);
+
+ }
+ catch (Exception ex)
+ {
+ result.Code = 500;
+ result.Message = ex.InnerException?.Message ?? ex.Message;
+ }
+
+ return result;
+ }
+
+ public <%=ModuleName%>sController(<%=ModuleName%>App app)
+ {
+ _app = app;
+ }
+ }
+}
diff --git a/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst b/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst
new file mode 100644
index 0000000000000000000000000000000000000000..867bfd0cd3c42d07c06b7fb29e737c3fbd267482
--- /dev/null
+++ b/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst
@@ -0,0 +1,66 @@
+<%@ Template Language="C#" TargetLanguage="C#" Debug="True" Encoding="UTF-8" %>
+
+<%@ Assembly Src="../Internal/Model.cs" %>
+<%@ Assembly Src="../Internal/Extensions.cs" %>
+
+<%@ Import Namespace="System.Collections.Generic" %>
+<%@ Import Namespace="System.Linq" %>
+<%@ Import Namespace="System.Text" %>
+<%@ Import Namespace="System.Text.RegularExpressions" %>
+
+<%@ Import Namespace="SchemaMapper" %>
+
+<%@ Property Name="Table"
+ Type="SchemaExplorer.TableSchema" %>
+
+<%@ Property Name="HeaderModel"
+Type="System.Boolean"
+Category="1.Database"
+Default="true"
+Description="是否为启用头表模式，即类似‘入库订单’界面" %>
+
+<%@ Property Name="EntityNamespace"
+ Type="System.String" %>
+//------------------------------------------------------------------------------
+//
+// This code was generated by a CodeSmith Template.
+//
+// DO NOT MODIFY contents of this file. Changes to this
+// file will be lost if the code is regenerated.
+// Author:Yubao Li
+//
+//------------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+using OpenAuth.Repository.Core;
+
+namespace OpenAuth.App.Request
+{
+ ///
+ /// <%= Table.Description %>
+ ///
+ [Table("<%= Table.Name%>")]
+ public partial class AddOrUpdate<%= Table.Name %>Req
+ {
+
+ <% foreach(ColumnSchema p in Table.Columns) {
+
+ %>
+ ///
+ /// <%=p.Description %>
+ ///
+ public <%= p.SystemType.ToNullableType(p.AllowDBNull == true) %> <%= p.Name%> { get; set; }
+ <% } %>
+
+ //todo:添加自己的请求字段
+ <%
+ if(Table.Name.Contains("Tbl") && (!Table.Name.Contains("Dtbl")) && this.HeaderModel){
+ var dtblName = Table.Name.Replace("Tbl","Dtbl"); //明细表的表名
+ %>
+ public ListReq> <%=dtblName%>Reqs { get; set; }
+ <% } %>
+ }
+}
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Web/Request.cst b/CodeSmith/CSharp/ApiGenerate/Request.cst
similarity index 93%
rename from CodeSmith/CSharp/Web/Request.cst
rename to CodeSmith/CSharp/ApiGenerate/Request.cst
index 734ad9ad6585c35b2fc8795920237c4225cc04e5..c7b9cf2f20d9218bdf9965f25f2b7d6cc355540d 100644
--- a/CodeSmith/CSharp/Web/Request.cst
+++ b/CodeSmith/CSharp/ApiGenerate/Request.cst
@@ -12,6 +12,6 @@ namespace OpenAuth.App.Request
{
public class Query<%=ModuleName%>ListReq : PageReq
{
- public string orgId { get; set; }
+ //todo:添加自己的请求字段
}
}
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Entity.cst b/CodeSmith/CSharp/Entity.cst
deleted file mode 100644
index 90952b98f534b1617177f02436aa3772585ab47a..0000000000000000000000000000000000000000
--- a/CodeSmith/CSharp/Entity.cst
+++ /dev/null
@@ -1,309 +0,0 @@
-<%@ Template Language="C#" TargetLanguage="Text" Debug="True" OutputType="None" %>
-
-<%@ Assembly Name="SchemaExplorer" %>
-<%@ Assembly Name="CodeSmith.CustomProperties" %>
-
-<%@ Assembly Name="Mono.Cecil" Path="..\Common" %>
-<%@ Assembly Name="ICSharpCode.NRefactory" Path="..\Common" %>
-<%@ Assembly Name="ICSharpCode.NRefactory.CSharp" Path="..\Common" %>
-
-<%@ Assembly Src="Internal\Model.cs" %>
-<%@ Assembly Src="Internal\Extensions.cs" %>
-<%@ Assembly Src="Internal\Generator.cs" %>
-<%@ Assembly Src="Internal\Parser.cs" %>
-
-<%@ Import Namespace="System.Collections.Generic" %>
-<%@ Import Namespace="System.IO" %>
-<%@ Import Namespace="System.Linq" %>
-<%@ Import Namespace="System.Text" %>
-<%@ Import Namespace="System.Text.RegularExpressions" %>
-
-<%@ Import Namespace="SchemaMapper" %>
-
-<%@ Property Name="SourceDatabase"
- Type="SchemaExplorer.DatabaseSchema"
- Category="1.Database"
- OnChanged="OnSourceDatabaseChanged"
- Description="The source database." %>
-
-<%@ Property Name="ContextNamespace"
- Type="System.String"
- Category="2.Class"
- OnChanged="OnContextNamespaceChanged"
- Description="The namespace to use for the data context class files."%>
-<%@ Property Name="EntityNamespace"
- Type="System.String"
- Category="2.Class"
- Description="The namespace to use for the entity class files."%>
-<%@ Property Name="MappingNamespace"
- Type="System.String"
- Category="2.Class"
- Description="The namespace to use for the mapping class files."%>
-
-<%@ Property Name="ContextDirectory"
- Category="3.Output"
- Type="System.String"
- Default=".\"
- Optional="True"
- Description="The folder to save the generated context files."
- Editor="System.Windows.Forms.Design.FolderNameEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" %>
-<%@ Property Name="EntityDirectory"
- Category="3.Output"
- Type="System.String"
- Default=".\Entities"
- Optional="True"
- Description="The folder to save the generated entity files."
- Editor="System.Windows.Forms.Design.FolderNameEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" %>
-<%@ Property Name="MappingDirectory"
- Category="3.Output"
- Type="System.String"
- Default=".\Mapping"
- Optional="True"
- Description="The folder to save the generated mapping files."
- Editor="System.Windows.Forms.Design.FolderNameEditor, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" %>
-
-<%@ Property Name="TableNaming"
- Type="SchemaMapper.TableNaming"
- Category="4.Hints"
- Default="Singular"
- Description="Provide generator a hint as to how the tables are named." %>
-<%@ Property Name="EntityNaming"
- Type="SchemaMapper.EntityNaming"
- Category="4.Hints"
- Default="Singular"
- Description="Tell generator how the entities are to be named." %>
-<%@ Property Name="RelationshipNaming"
- Type="SchemaMapper.RelationshipNaming"
- Category="4.Hints"
- Default="Plural"
- Description="Tell generator how the relationships are to be named." %>
-<%@ Property Name="ContextNaming"
- Type="SchemaMapper.ContextNaming"
- Category="4.Hints"
- Default="Plural"
- Description="Tell generator how the context properties are to be named." %>
-
-<%@ Property Name="IgnoreList"
- Type="CodeSmith.CustomProperties.StringCollection"
- Category="5.Customization"
- Default="sysdiagrams$"
- Optional="True"
- Description="List of regular expressions to ignore tables, views and commands when generating mapping." %>
-<%@ Property Name="InclusionMode"
- Type="Boolean"
- Category="5.Customization"
- Default="False"
- Optional="True"
- Description="Change the IgnoreList to be a list of table to include instead of ignore." %>
-<%@ Property Name="CleanExpressions"
- Type="CodeSmith.CustomProperties.StringCollection"
- Category="5.Customization"
- Default="^(sp|tbl|udf|vw)_"
- Optional="True"
- Description="List of regular expressions to clean table, view and column names." %>
-<%@ Property Name="InterfaceMode"
- Type="Boolean"
- Category="5.Customization"
- Default="False"
- Optional="True"
- Description="Use interfaces for DbContext." %>
-
-
-
-<%@ Register Name="ContextGeneratedClass"
- Template="Internal\Context.Generated.cst"
- MergeProperties="False" %>
-
-<%@ Register Name="EntityGeneratedClass"
- Template="Internal\Entity.Generated.cst"
- MergeProperties="False" %>
-
-<%@ Register Name="MappingGeneratedClass"
- Template="Internal\Mapping.Generated.cst"
- MergeProperties="False" %>
-
-Generating Entities ...
-<% Generate(); %>
-
-
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Internal/Context.Generated.cst b/CodeSmith/CSharp/Internal/Context.Generated.cst
index a314e2faf3be47b106442eb3c623fd57e3b2f53a..1a61f6e39cc0e13a11551d911e2a718f03fd58a2 100644
--- a/CodeSmith/CSharp/Internal/Context.Generated.cst
+++ b/CodeSmith/CSharp/Internal/Context.Generated.cst
@@ -1,7 +1,7 @@
<%@ Template Language="C#" TargetLanguage="C#" Debug="True" Encoding="UTF-8" %>
-<%@ Assembly Src="Model.cs" %>
-<%@ Assembly Src="Extensions.cs" %>
+<%@ Assembly Src="../Internal/Model.cs" %>
+<%@ Assembly Src="../Internal/Extensions.cs" %>
<%@ Import Namespace="System.Collections.Generic" %>
<%@ Import Namespace="System.Linq" %>
@@ -10,87 +10,72 @@
<%@ Import Namespace="SchemaMapper" %>
-<%@ Property Name="EntityContext" Type="SchemaMapper.EntityContext" %>
+<%@ Property Name="WholeDb"
+Type="System.Boolean"
+Category="1.Database"
+Default="true"
+Description="是否为整个数据库" %>
+
+<%@ Property Name="SourceDatabase"
+ Type="SchemaExplorer.DatabaseSchema"
+ Category="1.Database"
+ Description="The source database." %>
+
+<%@ Property Name="SourceTables"
+Type="SchemaExplorer.TableSchemaCollection"
+Category="1.Database" Description="选择部分表" %>
<%@ Property Name="ContextNamespace" Type="System.String" %>
<%@ Property Name="EntityNamespace" Type="System.String" %>
-<%@ Property Name="MappingNamespace" Type="System.String" %>
-<%@ Property Name="InterfaceMode" Type="Boolean" Default="False" Optional="True" %>
+
-//------------------------------------------------------------------------------
-//
-// This code was generated by a CodeSmith Template.
-//
-// DO NOT MODIFY contents of this file. Changes to this
-// file will be lost if the code is regenerated.
-//
-//------------------------------------------------------------------------------
-using System;
-using System.Data.Entity;
-using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
using <%= EntityNamespace %>;
-using <%= MappingNamespace %>;
namespace <%= ContextNamespace %>
{
-<% if (InterfaceMode) { %>
- public interface IDbContext : IDisposable
- {
- System.Data.Entity.Database Database { get; }
- System.Data.Entity.Infrastructure.DbChangeTracker ChangeTracker { get; }
- System.Data.Entity.Infrastructure.DbContextConfiguration Configuration { get; }
-
- System.Data.Entity.Infrastructure.DbEntityEntry Entry(object entity);
- System.Data.Entity.Infrastructure.DbEntityEntry Entry(TEntity entity) where TEntity : class;
-
- IEnumerable GetValidationErrors();
-
- System.Data.Entity.DbSet Set(Type entityType);
- System.Data.Entity.IDbSet Set() where TEntity : class;
-
- int SaveChanges();
- }
-
- public partial interface I<%= EntityContext.ClassName.ToSafeName() %> : IDbContext
- {
-<% foreach(var p in EntityContext.Entities) { %>
- System.Data.Entity.IDbSet<<%= EntityNamespace %>.<%= p.ClassName.ToSafeName() %>> <%= p.ContextName.ToSafeName() %> { get; set; }
-<% } // foreach %>
- }
-
-<% } // if interface %>
- public partial class <%= EntityContext.ClassName.ToSafeName() %>: DbContext<%= InterfaceMode ? ", I" + EntityContext.ClassName.ToSafeName() : string.Empty %>
- {
- static <%= EntityContext.ClassName.ToSafeName() %>()
- {
- Database.SetInitializer< <%= EntityContext.ClassName.ToSafeName() %>>(null);
+ <%
+ string dbContextName;
+ if(WholeDb){
+ dbContextName = SourceDatabase.Name.ToSafeName();
}
- public <%= EntityContext.ClassName.ToSafeName() %>()
- :base("Name=<%= EntityContext.ClassName.ToSafeName() %>")
- { }
-
- public <%= EntityContext.ClassName.ToSafeName() %>(string nameOrConnectionString)
- : base(nameOrConnectionString)
- { }
-
-<% foreach(var p in EntityContext.Entities) { %>
- public System.Data.Entity.<%= InterfaceMode ? "I" : "" %>DbSet<<%= p.ClassName.ToSafeName() %>> <%= p.ContextName.ToSafeName() %> { get; set; }
-<% } // foreach %>
-
- protected override void OnModelCreating(DbModelBuilder modelBuilder)
+ else{
+ dbContextName = SourceTables.First().Database.Name.ToSafeName();
+ }
+ dbContextName = StringUtil.ToPascalCase(dbContextName);
+ Response.WriteLine(" public partial class "+ dbContextName +"Context: DbContext");
+
+ %>
+ {
+
+ protected override void OnModelCreating(ModelBuilder modelBuilder)
{
-<% foreach(var p in EntityContext.Entities) { %>
- modelBuilder.Configurations.Add(new <%= p.MappingName.ToSafeName() %>());
-<% } // foreach %>
-
- // InitializeMapping(modelBuilder);
+ //当主键为联合主键时，需要把这里的内容拷贝到对应的位置
+ <%
+ TableSchemaCollection tables;
+ if(WholeDb){
+ tables = SourceDatabase.Tables;
+ }
+ else{
+ tables = SourceTables;
+ }
+
+ foreach(TableSchema table in tables)
+ {
+ if(table.PrimaryKeys.Count <=1) continue;
+ var keys = string.Join(",", table.Columns.Where(u=>u.IsPrimaryKeyMember==true)
+ .Select(u =>"c."+u.Name));
+ Response.WriteLine(" modelBuilder.Entity<"+table.Name+">()");
+ Response.WriteLine(" .HasKey(c => new { "+keys+" });");
+ }
+ %>
}
-<% if (InterfaceMode) { %>
- System.Data.Entity.IDbSet IDbContext.Set()
+ <%
+ foreach(TableSchema table in tables)
{
- return base.Set();
+ Response.WriteLine(" public virtual DbSet<"+table.Name+"> "+StringUtil.ToPascalCase(StringUtil.ToPlural(table.Name))+" { get; set; }");
}
-<% } // if interface %>
+ %>
}
}
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Internal/Entity.Generated.cst b/CodeSmith/CSharp/Internal/Entity.Generated.cst
index 632d50d91e29a36be54718dc75025f6c9789428d..ba085a781bf7a984f70bbc06e6eab8b769e84ec6 100644
--- a/CodeSmith/CSharp/Internal/Entity.Generated.cst
+++ b/CodeSmith/CSharp/Internal/Entity.Generated.cst
@@ -1,7 +1,7 @@
<%@ Template Language="C#" TargetLanguage="C#" Debug="True" Encoding="UTF-8" %>
-<%@ Assembly Src="Model.cs" %>
-<%@ Assembly Src="Extensions.cs" %>
+<%@ Assembly Src="../Internal/Model.cs" %>
+<%@ Assembly Src="../Internal/Extensions.cs" %>
<%@ Import Namespace="System.Collections.Generic" %>
<%@ Import Namespace="System.Linq" %>
@@ -10,8 +10,8 @@
<%@ Import Namespace="SchemaMapper" %>
-<%@ Property Name="Entity"
- Type="SchemaMapper.Entity" %>
+<%@ Property Name="Table"
+ Type="SchemaExplorer.TableSchema" %>
<%@ Property Name="EntityNamespace"
Type="System.String" %>
@@ -26,47 +26,50 @@
//------------------------------------------------------------------------------
using System;
using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations.Schema;
using System.Text;
+using OpenAuth.Repository.Core;
namespace <%= EntityNamespace %>
{
///
- /// <%= Entity.Description %>
+ /// <%= Table.Description %>
///
- public partial class <%= Entity.ClassName.ToSafeName() %> : Entity
+ [Table("<%= Table.Name%>")]
+ public partial class <%= Table.Name %> : Entity
{
- public <%= Entity.ClassName.ToSafeName() %>()
+ public <%= Table.Name %>()
{
-<% foreach(var p in Entity.Properties) {
- if(p.IsPrimaryKey ==true) continue;
- string type = p.SystemType.ToNullableType(p.IsNullable == true);
- if(type =="int" || type=="decimal")
- Response.WriteLine(" this."+p.PropertyName.ToSafeName()+"= 0;");
- else if(type =="string")
- Response.WriteLine(" this."+p.PropertyName.ToSafeName()+"= string.Empty;");
- else if(type.ToLower().Contains("datetime"))
- Response.WriteLine(" this."+p.PropertyName.ToSafeName()+"= DateTime.Now;");
- } // foreach %>
-<% foreach(var r in Entity.Relationships.Where(e => e.ThisCardinality == Cardinality.Many)) { %>
- <%= r.ThisPropertyName.ToSafeName() %> = new List<<%= r.OtherEntity.ToSafeName() %>>();
-<% } // foreach %>
+ <% foreach(ColumnSchema p in Table.Columns) {
+ if(p.IsPrimaryKeyMember) continue;
+ string type = p.SystemType.ToNullableType(p.AllowDBNull == true);
+ if(type =="int" || type=="decimal")
+ Response.WriteLine(" this."+p.Name+"= 0;");
+ else if(type =="string")
+ Response.WriteLine(" this."+p.Name+"= string.Empty;");
+ else if(type.ToLower().Contains("datetime"))
+ Response.WriteLine(" this."+p.Name+"= DateTime.Now;");
+ } // foreach %>
}
-<% foreach(var p in Entity.Properties) {
- if(p.IsPrimaryKey ==true) continue;
- %>
+
+ <%
+ foreach(ColumnSchema p in Table.Columns) {
+ if(p.IsPrimaryKeyMember) continue;
+ %>
///
- /// <%=p.Description %>
- ///
- public <%= p.SystemType.ToNullableType(p.IsNullable == true) %> <%= p.PropertyName.ToSafeName() %> { get; set; }
-<% } // foreach %>
-
-<% foreach(var r in Entity.Relationships) { %>
-<% if(r.ThisCardinality == Cardinality.Many) { %>
- public virtual ICollection<<%= r.OtherEntity.ToSafeName() %>> <%= r.ThisPropertyName.ToSafeName() %> { get; set; }
-<% } else { %>
- public virtual <%= r.OtherEntity.ToSafeName() %> <%= r.ThisPropertyName.ToSafeName() %> { get; set; }
-<% } %>
-<% } // foreach %>
+ /// <%=p.Description %>
+ ///
+ [Description("<%=p.Description%>")]
+ <%if(p.Name.LastIndexOf("Id") != -1){%>
+ [Browsable(false)]
+ <%}%>
+ <%if(p.DataType == DbType.Byte){%>
+ public bool <%= p.Name%> { get; set; }
+ <%}else{%>
+ public <%= p.SystemType.ToNullableType(p.AllowDBNull == true) %> <%= p.Name%> { get; set; }
+ <%}%>
+ <% } // foreach %>
}
}
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Internal/Generator.cs b/CodeSmith/CSharp/Internal/Generator.cs
index c3ecd1c6e56b80693a214222e3e878deda50282f..a5e660e030975435f008efd476a590291ba7ab13 100644
--- a/CodeSmith/CSharp/Internal/Generator.cs
+++ b/CodeSmith/CSharp/Internal/Generator.cs
@@ -205,6 +205,27 @@ namespace SchemaMapper
get { return _settings; }
}
+ //按表信息创建DbContext
+ public EntityContext Generate(TableSchema tableSchema)
+ {
+ // only DeepLoad when in ignore mode
+ tableSchema.DeepLoad = !Settings.InclusionMode;
+
+ var entityContext = new EntityContext();
+ entityContext.DatabaseName = tableSchema.Database.Name;
+
+ string dataContextName = StringUtil.ToPascalCase(tableSchema.Database.Name) + "Context";
+ dataContextName = _namer.UniqueClassName(dataContextName);
+
+ entityContext.ClassName = dataContextName;
+
+ GetEntity(entityContext, tableSchema);
+
+
+ return entityContext;
+ }
+
+ //按数据库连接信息创建DbContext
public EntityContext Generate(DatabaseSchema databaseSchema)
{
// only DeepLoad when in ignore mode
@@ -240,8 +261,8 @@ namespace SchemaMapper
return entityContext;
}
-
- private Entity GetEntity(EntityContext entityContext, TableSchema tableSchema, bool processRelationships = true, bool processMethods = true)
+ //根据DbContext和tableSchema获取实体
+ public Entity GetEntity(EntityContext entityContext, TableSchema tableSchema, bool processRelationships = true, bool processMethods = true)
{
string key = tableSchema.FullName;
@@ -363,7 +384,7 @@ namespace SchemaMapper
if (Settings.IsIgnored(tableKey.ForeignKeyTable.FullName)
|| Settings.IsIgnored(tableKey.PrimaryKeyTable.FullName))
{
- Debug.WriteLine("Skipping relationship '{0}' because table '{1}' or '{2}' is ignored.",
+ Debug.WriteLine("Skipping relationship '{0}' because table '{1}' or '{2}' is ignored.",
tableKey.FullName, tableKey.ForeignKeyTable.FullName, tableKey.PrimaryKeyTable.FullName);
continue;
diff --git a/CodeSmith/CSharp/Internal/Mapping.Generated.cst b/CodeSmith/CSharp/Internal/Mapping.Generated.cst
deleted file mode 100644
index 8d59b7fdd5a524cf011400680f1d6c977562eca8..0000000000000000000000000000000000000000
--- a/CodeSmith/CSharp/Internal/Mapping.Generated.cst
+++ /dev/null
@@ -1,294 +0,0 @@
-<%@ Template Language="C#" TargetLanguage="C#" Debug="True" Encoding="UTF-8" %>
-
-<%@ Assembly Src="Model.cs" %>
-<%@ Assembly Src="Extensions.cs" %>
-
-<%@ Import Namespace="System.Collections.Generic" %>
-<%@ Import Namespace="System.Linq" %>
-<%@ Import Namespace="System.Text" %>
-<%@ Import Namespace="System.Text.RegularExpressions" %>
-
-<%@ Import Namespace="SchemaMapper" %>
-
-<%@ Property Name="Entity" Type="SchemaMapper.Entity" %>
-<%@ Property Name="ContextNamespace" Type="System.String" %>
-<%@ Property Name="EntityNamespace" Type="System.String" %>
-<%@ Property Name="MappingNamespace" Type="System.String" %>
-//------------------------------------------------------------------------------
-//
-// This code was generated by a CodeSmith Template.
-//
-// DO NOT MODIFY contents of this file. Changes to this
-// file will be lost if the code is regenerated.
-//
-//------------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace <%= MappingNamespace %>
-{
- public partial class <%= Entity.MappingName.ToSafeName() %>
- : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<<%= EntityNamespace %>.<%= Entity.ClassName.ToSafeName() %>>
- {
- public <%= Entity.MappingName.ToSafeName() %>()
- {
- // table
-<% if (string.IsNullOrEmpty(Entity.TableSchema)) { %>
- ToTable("<%= Entity.TableName %>");
-<% } else { %>
- ToTable("<%= Entity.TableName %>", "<%= Entity.TableSchema %>");
-<% } %>
-
- // keys
-<% if (Entity.Properties.PrimaryKeys.Count() > 0) { %>
- HasKey(t => <%= KeyExpression(Entity.Properties.PrimaryKeys, "t") %>);
-<% } %>
-
- // Properties
-<%
-foreach(var p in Entity.Properties)
-{
- Response.Write(PropertyExpression(p));
-}
-%>
-
- // Relationships
-<%
-foreach(var r in Entity.Relationships.Where(e => e.IsMapped))
-{
- if (r.IsManyToMany)
- Response.Write(ManyToManyExpression(r));
- else
- Response.Write(RelationshipExpression(r));
-}
-%>
- }
- }
-}
-
-
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Web/Controller.cst b/CodeSmith/CSharp/Web/Controller.cst
index 3858e30dcbd84885a6e4fdda6eedf689d26345c1..307d1fe01ac1638d340351eba626f678d08b913e 100644
--- a/CodeSmith/CSharp/Web/Controller.cst
+++ b/CodeSmith/CSharp/Web/Controller.cst
@@ -10,34 +10,39 @@ Description: Create a list of properties from a database table
<%@ Import Namespace="SchemaExplorer" %>
using System;
-using System.Web.Http;
-using System.Web.Mvc;
+using System.Collections.Generic;
+using System.Linq;
using Infrastructure;
+using Microsoft.AspNetCore.Mvc;
using OpenAuth.App;
+using OpenAuth.App.Interface;
using OpenAuth.App.Request;
-using OpenAuth.App.Response;
-using OpenAuth.Mvc.Models;
+using OpenAuth.Repository.Domain;
namespace OpenAuth.Mvc.Controllers
{
public class <%=ModuleName%>sController : BaseController
{
- public <%=ModuleName%>App App { get; set; }
+ private readonly <%=ModuleName%>App _app;
- //
- [Authenticate]
+ public <%=ModuleName%>sController(<%=ModuleName%>App app, IAuth auth) : base(auth)
+ {
+ _app = app;
+ }
+
+ //主页
public ActionResult Index()
{
return View();
}
//添加或修改
- [System.Web.Mvc.HttpPost]
+ [HttpPost]
public string Add(<%=ModuleName%> obj)
{
try
{
- App.Add(obj);
+ _app.Add(obj);
}
catch (Exception ex)
@@ -49,12 +54,12 @@ namespace OpenAuth.Mvc.Controllers
}
//添加或修改
- [System.Web.Mvc.HttpPost]
+ [HttpPost]
public string Update(<%=ModuleName%> obj)
{
try
{
- App.Update(obj);
+ _app.Update(obj);
}
catch (Exception ex)
@@ -68,17 +73,17 @@ namespace OpenAuth.Mvc.Controllers
///
/// 加载列表
///
- public string Load([FromUri]Query<%=ModuleName%>ListReq request)
+ public string Load([FromQuery]Query<%=ModuleName%>ListReq request)
{
- return JsonHelper.Instance.Serialize(App.Load(request));
+ return JsonHelper.Instance.Serialize(_app.Load(request));
}
- [System.Web.Mvc.HttpPost]
+ [HttpPost]
public string Delete(string[] ids)
{
try
{
- App.Delete(ids);
+ _app.Delete(ids);
}
catch (Exception e)
{
diff --git a/CodeSmith/CSharp/Web/Index.cshtml.cst b/CodeSmith/CSharp/Web/Index.cshtml.cst
index 4ff073c3c1c42a2313930bf8f69ba40af849c445..94c8e495e72c383b8a5c8d45a3d3e16facdca5a4 100644
--- a/CodeSmith/CSharp/Web/Index.cshtml.cst
+++ b/CodeSmith/CSharp/Web/Index.cshtml.cst
@@ -21,45 +21,34 @@ Description="连接的数据库" %>
-
-
-
-
-
-
- |
- <% foreach (ColumnSchema column in this.SourceTable.Columns) {%>
- <%=Tools.GetDescription(column)%> |
- <% }%>
- |
-
-
-
-
-