diff --git a/backend/Admin.NET.Core/Entity/SysCodeGen.cs b/backend/Admin.NET.Core/Entity/SysCodeGen.cs
index 60f27677eb26ac17c7386a9fa20983eb877fa410..12e48ffa5950152a7663d4afb7996a6f19d146d3 100644
--- a/backend/Admin.NET.Core/Entity/SysCodeGen.cs
+++ b/backend/Admin.NET.Core/Entity/SysCodeGen.cs
@@ -4,65 +4,53 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace Admin.NET.Core
{
- ///
- /// 代码生成表
- ///
+ /// 代码生成表
[Table("sys_code_gen")]
[Comment("代码生成表")]
public class SysCodeGen : DEntityBase
{
- ///
- /// 作者姓名
- ///
+ /// 作者姓名
[Comment("作者姓名")]
[MaxLength(20)]
public string AuthorName { get; set; }
- ///
- /// 是否移除表前缀
- ///
+ /// 是否移除表前缀
[Comment("是否移除表前缀")]
[MaxLength(5)]
public string TablePrefix { get; set; }
- ///
- /// 生成方式
- ///
+ /// 生成方式
[Comment("生成方式")]
[MaxLength(20)]
public string GenerateType { get; set; }
- ///
- /// 数据库表名
- ///
+ /// 数据库表名
[Comment("数据库表名")]
[MaxLength(100)]
public string TableName { get; set; }
- ///
- /// 命名空间
- ///
+ /// 命名空间
[Comment("命名空间")]
[MaxLength(100)]
public string NameSpace { get; set; }
- ///
- /// 业务名
- ///
+ [NotMapped]
+ public string ProName
+ {
+ get { return NameSpace.TrimEnd(new char[] { '.', 'A', 'p', 'p', 'l', 'i', 'c', 'a', 't', 'i', 'o', 'n' }); }
+ }
+
+ /// 业务名
[Comment("业务名")]
[MaxLength(100)]
public string BusName { get; set; }
- ///
- /// 菜单应用分类(应用编码)
- ///
+ /// 菜单应用分类(应用编码)
[Comment("菜单应用分类")]
[MaxLength(50)]
public string MenuApplication { get; set; }
- ///
- /// 菜单编码
- ///
+ /// 菜单编码
[Comment("菜单编码")]
public long MenuPid { get; set; }
}
diff --git a/backend/Admin.NET.Core/Service/CodeGen/CodeGenService.cs b/backend/Admin.NET.Core/Service/CodeGen/CodeGenService.cs
index a4aab2eaea14cca0488d9f29177d13b4322d15d7..9024d81bf724fd37b9b332720bb7502ef56a7e5b 100644
--- a/backend/Admin.NET.Core/Service/CodeGen/CodeGenService.cs
+++ b/backend/Admin.NET.Core/Service/CodeGen/CodeGenService.cs
@@ -16,9 +16,7 @@ using System.Threading.Tasks;
namespace Admin.NET.Core.Service.CodeGen
{
- ///
- /// 代码生成器服务
- ///
+ /// 代码生成器服务
[ApiDescriptionSettings(Name = "CodeGen", Order = 100)]
public class CodeGenService : ICodeGenService, IDynamicApiController, ITransient
{
@@ -39,11 +37,9 @@ namespace Admin.NET.Core.Service.CodeGen
_sysMenuRep = sysMenuRep;
}
- ///
- /// 分页查询
- ///
- ///
- ///
+ /// 分页查询
+ ///
+ ///
[HttpGet("/codeGenerate/page")]
public async Task QueryCodeGenPageList([FromQuery] CodeGenPageInput input)
{
@@ -54,11 +50,9 @@ namespace Admin.NET.Core.Service.CodeGen
return XnPageResult.PageResult(codeGens);
}
- ///
- /// 增加
- ///
- ///
- ///
+ /// 增加
+ ///
+ ///
[HttpPost("/codeGenerate/add")]
public async Task AddCodeGen(AddCodeGenInput input)
{
@@ -73,11 +67,9 @@ namespace Admin.NET.Core.Service.CodeGen
_codeGenConfigService.AddList(GetColumnList(input), newCodeGen.Entity);
}
- ///
- /// 删除
- ///
- ///
- ///
+ /// 删除
+ ///
+ ///
[HttpPost("/codeGenerate/delete")]
public async Task DeleteCodeGen(List inputs)
{
@@ -94,11 +86,9 @@ namespace Admin.NET.Core.Service.CodeGen
await Task.WhenAll(codeGenConfigTaskList);
}
- ///
- /// 更新
- ///
- ///
- ///
+ /// 更新
+ ///
+ ///
[HttpPost("/codeGenerate/edit")]
public async Task UpdateCodeGen(UpdateCodeGenInput input)
{
@@ -110,21 +100,17 @@ namespace Admin.NET.Core.Service.CodeGen
await codeGen.UpdateAsync();
}
- ///
- /// 详情
- ///
- ///
- ///
+ /// 详情
+ ///
+ ///
[HttpGet("/codeGenerate/detail")]
public async Task GetCodeGen([FromQuery] QueryCodeGenInput input)
{
return await _sysCodeGenRep.DetachedEntities.FirstOrDefaultAsync(u => u.Id == input.Id);
}
- ///
- /// 获取数据库表(实体)集合
- ///
- ///
+ /// 获取数据库表(实体)集合
+ ///
[HttpGet("/codeGenerate/InformationList")]
public List GetTableList()
{
@@ -135,10 +121,8 @@ namespace Admin.NET.Core.Service.CodeGen
}).ToList();
}
- ///
- /// 根据表名获取列
- ///
- ///
+ /// 根据表名获取列
+ ///
[HttpGet("/codeGenerate/ColumnList/{tableName}")]
public List GetColumnListByTableName(string tableName)
{
@@ -162,10 +146,8 @@ namespace Admin.NET.Core.Service.CodeGen
}).ToList();
}
- ///
- /// 获取数据表列(实体属性)集合
- ///
- ///
+ /// 获取数据表列(实体属性)集合
+ ///
[NonAction]
public List GetColumnList([FromQuery] AddCodeGenInput input)
{
@@ -189,10 +171,8 @@ namespace Admin.NET.Core.Service.CodeGen
}).ToList();
}
- ///
- /// 代码生成_本地项目
- ///
- ///
+ /// 代码生成_本地项目
+ ///
[HttpPost("/codeGenerate/runLocal")]
public async Task RunLocal(SysCodeGen input)
{
@@ -219,7 +199,8 @@ namespace Admin.NET.Core.Service.CodeGen
input.NameSpace,
ClassName = input.TableName,
QueryWhetherList = queryWhetherList,
- TableField = tableFieldList
+ TableField = tableFieldList,
+ ProName = input.ProName
});
var dirPath = new DirectoryInfo(targetPathList[i]).Parent.FullName;
@@ -338,10 +319,8 @@ namespace Admin.NET.Core.Service.CodeGen
}.InsertAsync();
}
- ///
- /// 获取模板文件路径集合
- ///
- ///
+ /// 获取模板文件路径集合
+ ///
private List GetTemplatePathList()
{
var templatePath = App.WebHostEnvironment.WebRootPath + @"\Template\";
@@ -359,14 +338,12 @@ namespace Admin.NET.Core.Service.CodeGen
};
}
- ///
- /// 设置生成文件路径
- ///
- ///
- ///
+ /// 设置生成文件路径
+ ///
+ ///
private List GetTargetPathList(SysCodeGen input)
{
- var backendPath = new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName + @"\Admin.NET.Application\Service\" + input.TableName + @"\";
+ var backendPath = new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName + @"\" + input.NameSpace + @"\Service\" + input.TableName + @"\";
var servicePath = backendPath + input.TableName + "Service.cs";
var iservicePath = backendPath + "I" + input.TableName + "Service.cs";
var inputPath = backendPath + @"Dto\" + input.TableName + "Input.cs";
diff --git a/backend/Admin.NET.Web.Entry/wwwroot/Template/Dto.cs.vm b/backend/Admin.NET.Web.Entry/wwwroot/Template/Dto.cs.vm
index bfa1ecd0ff9fc0f2e2ce8da46d9f621c6a4e5c97..88ea1853824a58a91209cb1b67a61d962c6cd4f0 100644
--- a/backend/Admin.NET.Web.Entry/wwwroot/Template/Dto.cs.vm
+++ b/backend/Admin.NET.Web.Entry/wwwroot/Template/Dto.cs.vm
@@ -1,5 +1,5 @@
using System;
-using Admin.NET.Core;
+using @(@Model.ProName).Core;
namespace @Model.NameSpace
{
diff --git a/backend/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm b/backend/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
index c94ed671c918c35ac6d00fa8e1b3b2dc4b9068cf..dcf9f4cf47c82553cbf4c47ac6fa8250aebd3d87 100644
--- a/backend/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
+++ b/backend/Admin.NET.Web.Entry/wwwroot/Template/Input.cs.vm
@@ -1,4 +1,4 @@
-using Admin.NET.Core;
+using @(@Model.ProName).Core;
using System;
using System.ComponentModel.DataAnnotations;
diff --git a/backend/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm b/backend/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
index 78ef9dfc1bf0995080032f285b0507aead0c8b71..14ef6d8f2ece6f3e5c74e68311d99a1590395ff9 100644
--- a/backend/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
+++ b/backend/Admin.NET.Web.Entry/wwwroot/Template/Service.cs.vm
@@ -1,4 +1,4 @@
-using Admin.NET.Core;
+using @(@Model.ProName).Core;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection;