diff --git a/CodeSmith/CSharp/ApiGenerate.cst b/CodeSmith/CSharp/ApiGenerate.cst
index 9d201f29..cc7834ef 100644
--- a/CodeSmith/CSharp/ApiGenerate.cst
+++ b/CodeSmith/CSharp/ApiGenerate.cst
@@ -180,7 +180,7 @@ Category="1.Database" Description="可以选择一个或多个表（使用Ctrl
foreach(TableSchema table in tables)
{
- string generatedFile = Path.GetFullPath(directory) + "OpenAuth.App\\"+ table.Name + "App.cs";
+ string generatedFile = Path.GetFullPath(directory) + "OpenAuth.App\\"+ table.Name +"\\"+ table.Name + "App.cs";
generatedClass.Table = table;
//generatedClass.Entity = entity;
Response.WriteLine("已生成"+generatedFile);
@@ -196,7 +196,7 @@ Category="1.Database" Description="可以选择一个或多个表（使用Ctrl
this.CopyPropertiesTo(generatedClass);
foreach(TableSchema table in tables)
{
- string generatedFile = Path.GetFullPath(directory) + "OpenAuth.App\\Request\\Query"+ table.Name + "ListReq.cs";
+ string generatedFile = Path.GetFullPath(directory) + "OpenAuth.App\\"+ table.Name +"\\Request\\Query"+ table.Name + "ListReq.cs";
generatedClass.ModuleName = table.Name;
Response.WriteLine("已生成"+generatedFile);
generatedClass.RenderToFile(generatedFile, generatedFile, true);
@@ -207,7 +207,7 @@ Category="1.Database" Description="可以选择一个或多个表（使用Ctrl
this.CopyPropertiesTo(modifyReqGenerateClass);
foreach(TableSchema table in tables)
{
- string generatedFile = Path.GetFullPath(directory) + "OpenAuth.App\\Request\\AddOrUpdate"+ table.Name + "Req.cs";
+ string generatedFile = Path.GetFullPath(directory) + "OpenAuth.App\\"+ table.Name +"\\Request\\AddOrUpdate"+ table.Name + "Req.cs";
modifyReqGenerateClass.Table = table;
Response.WriteLine("已生成"+generatedFile);
modifyReqGenerateClass.RenderToFile(generatedFile, generatedFile, true);
diff --git a/CodeSmith/CSharp/ApiGenerate/Application.cst b/CodeSmith/CSharp/ApiGenerate/Application.cst
index 341b1799..0db0e354 100644
--- a/CodeSmith/CSharp/ApiGenerate/Application.cst
+++ b/CodeSmith/CSharp/ApiGenerate/Application.cst
@@ -9,13 +9,13 @@ Description: Create a list of properties from a database table
<%@ Import Namespace="SchemaExplorer" %>
<%@ Property Name="Table"
Type="SchemaExplorer.TableSchema" %>
-
<%@ Property Name="HeaderModel"
Type="System.Boolean"
Category="1.Database"
Default="true"
Description="是否为启用头表模式，即类似‘入库订单’界面" %>
-
+<%@ Assembly Src="../Web/Util.cs" %>
+<%@ Import Namespace="Util" %>
using System;
using System.Linq;
using Infrastructure;
@@ -25,14 +25,11 @@ using OpenAuth.App.Response;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
-
-
namespace OpenAuth.App
{
public class <%=Table.Name%>App : BaseStringApp<<%=Table.Name%>, OpenAuthDBContext>
{
private RevelanceManagerApp _revelanceApp;
-
///
/// 加载列表
///
@@ -43,23 +40,17 @@ namespace OpenAuth.App
{
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)
@@ -68,16 +59,14 @@ namespace OpenAuth.App
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:补充或调整自己需要的字段
+ //todo:根据自己的业务场景，补充或调整字段
obj.CreateTime = DateTime.Now;
var user = _auth.GetCurrentUser().User;
obj.CreateUserId = user.Id;
@@ -91,14 +80,11 @@ namespace OpenAuth.App
_<%=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为空的添加
@@ -107,7 +93,6 @@ namespace OpenAuth.App
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();
@@ -115,72 +100,57 @@ namespace OpenAuth.App
{
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:补充或调整自己需要的字段
- });
-
+ <%CreateUpdate();%>
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;
+ //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:补充或调整自己需要的字段
- });
-
+ <%CreateUpdate();%>
}
-
<%
}
%>
-
public <%=Table.Name%>App(IUnitWork unitWork, IRepository<<%=Table.Name%>, OpenAuthDBContext> repository,
RevelanceManagerApp app, IAuth auth) : base(unitWork, repository,auth)
{
_revelanceApp = app;
}
}
-}
\ No newline at end of file
+}
+
\ No newline at end of file
diff --git a/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst b/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst
index 867bfd0c..34bbb561 100644
--- a/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst
+++ b/CodeSmith/CSharp/ApiGenerate/ModifyReq.cst
@@ -55,7 +55,7 @@ namespace OpenAuth.App.Request
public <%= p.SystemType.ToNullableType(p.AllowDBNull == true) %> <%= p.Name%> { get; set; }
<% } %>
- //todo:添加自己的请求字段
+ //todo:根据自己的业务场景添加需要的字段
<%
if(Table.Name.Contains("Tbl") && (!Table.Name.Contains("Dtbl")) && this.HeaderModel){
var dtblName = Table.Name.Replace("Tbl","Dtbl"); //明细表的表名
diff --git a/CodeSmith/CSharp/ApiGenerate/Request.cst b/CodeSmith/CSharp/ApiGenerate/Request.cst
index c7b9cf2f..6b9b70e7 100644
--- a/CodeSmith/CSharp/ApiGenerate/Request.cst
+++ b/CodeSmith/CSharp/ApiGenerate/Request.cst
@@ -12,6 +12,6 @@ namespace OpenAuth.App.Request
{
public class Query<%=ModuleName%>ListReq : PageReq
{
- //todo:添加自己的请求字段
+ //todo:根据自己的业务场景添加需要的字段
}
}
\ No newline at end of file
diff --git a/CodeSmith/CSharp/Web/Util.cs b/CodeSmith/CSharp/Web/Util.cs
index 9134997d..bb5da1c8 100644
--- a/CodeSmith/CSharp/Web/Util.cs
+++ b/CodeSmith/CSharp/Web/Util.cs
@@ -20,5 +20,20 @@ namespace Util{
return SourceTable.Columns.Contains("ParentId")
|| SourceTable.Columns.Contains("CascadeId") ;
}
+
+
+ public static string CreateBlank(int level){
+ if(level == 1){
+ return " ";
+ }
+ else{
+ var twoblanks = " ";
+ for (int i = level-1; i > 1; i--)
+ {
+ twoblanks +=twoblanks;
+ }
+ return CreateBlank(1) + twoblanks;
+ }
+ }
}
}
\ No newline at end of file