wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码生成功能

Browse Source
This commit is contained in:
izory 2021-09-16 17:52:31 +08:00
parent db49575a0d
commit ced13d7b10
9 changed files with 247 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ZR.Admin.WebApi/Template/ControllersTemplate.txt
View File

@ -2,41 +2,40 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using ZR.Admin.WebApi.Filters;
using ZR.Admin.WebApi.Controllers;
using ZR.Service.Business;
using SqlSugar; using SqlSugar;
using Infrastructure; using Infrastructure;
using Infrastructure.Attribute; using Infrastructure.Attribute;
using Infrastructure.Enums; using Infrastructure.Enums;
using Infrastructure.Model; using Infrastructure.Model;
using Mapster; using Mapster;
using ZR.Admin.WebApi.Extensions;
using {ModelsNamespace}.Dto; using {ModelsNamespace}.Dto;
using {ModelsNamespace}.Models; using {ModelsNamespace}.Models;
using {ServicesNamespace}.Business;
using {ApiControllerNamespace}.Extensions;
using {ApiControllerNamespace}.Filters;
using {ApiControllerNamespace}.Controllers;
namespace ZRAdmin.Controllers namespace {ApiControllerNamespace}.Controllers
{ {
/// <summary> /// <summary>
/// 代码自动生成 /// 代码自动生成
/// </summary> /// </summary>
[Verify] [Verify]
[Route("bus/{ModelName}")] [Route("bus/{ModelName}")]
public class {ControllerName}Controller: BaseController public class {ModelName}Controller: BaseController
{ {
/// <summary> /// <summary>
/// {FileName}接口 /// {TableDesc}接口
/// </summary> /// </summary>
private readonly I{ServiceName} _{ServiceName}; private readonly I{ModelName}Service _{ModelName}Service;
public {ControllerName}Controller(I{ServiceName} {ServiceName}) public {ModelName}Controller(I{ModelName}Service {ModelName}Service)
{ {
_{ServiceName} = {ServiceName}; _{ModelName}Service = {ModelName}Service;
} }
/// <summary> /// <summary>
/// 查询{FileName}列表 /// 查询{TableDesc}列表
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("list")] [HttpGet("list")]
@ -49,32 +48,32 @@ namespace ZRAdmin.Controllers
//TODO 搜索条件 //TODO 搜索条件
//predicate = predicate.And(m => m.Name.Contains(parm.Name)); //predicate = predicate.And(m => m.Name.Contains(parm.Name));
var response = _{ServiceName}.GetPages(predicate.ToExpression(), parm); var response = _{ModelName}Service.GetPages(predicate.ToExpression(), parm);
return SUCCESS(response); return SUCCESS(response);
} }
/// <summary> /// <summary>
/// 查询{FileName}详情 /// 查询{TableDesc}详情
/// </summary> /// </summary>
/// <param name="{primaryKey}"></param> /// <param name="{PrimaryKey}"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("{{primaryKey}}")] [HttpGet("{{PrimaryKey}}")]
[ActionPermissionFilter(Permission = "{Permission}:query")] [ActionPermissionFilter(Permission = "{Permission}:query")]
public IActionResult Get({KeyTypeName} {primaryKey}) public IActionResult Get({KeyTypeName} {PrimaryKey})
{ {
var response = _{ServiceName}.GetId({primaryKey}); var response = _{ModelName}Service.GetId({PrimaryKey});
return SUCCESS(response); return SUCCESS(response);
} }
/// <summary> /// <summary>
/// 添加{FileName} /// 添加{TableDesc}
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[ActionPermissionFilter(Permission = "{Permission}:add")] [ActionPermissionFilter(Permission = "{Permission}:add")]
[Log(Title = "{FileName}添加", BusinessType = BusinessType.INSERT)] [Log(Title = "{TableDesc}添加", BusinessType = BusinessType.INSERT)]
public IActionResult Create([FromBody] {ModelName}Dto parm) public IActionResult Create([FromBody] {ModelName}Dto parm)
{ {
if (parm == null) if (parm == null)
@ -85,16 +84,16 @@ namespace ZRAdmin.Controllers
var addModel = parm.Adapt<{ModelName}>().ToCreate(); var addModel = parm.Adapt<{ModelName}>().ToCreate();
//addModel.CreateID = User.Identity.Name; //addModel.CreateID = User.Identity.Name;
return SUCCESS(_{ServiceName}.Add(addModel)); return SUCCESS(_{ModelName}Service.Add(addModel));
} }
/// <summary> /// <summary>
/// 更新{FileName} /// 更新{TableDesc}
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPut] [HttpPut]
[ActionPermissionFilter(Permission = "{Permission}:update")] [ActionPermissionFilter(Permission = "{Permission}:update")]
[Log(Title = "{FileName}修改", BusinessType = BusinessType.UPDATE)] [Log(Title = "{TableDesc}修改", BusinessType = BusinessType.UPDATE)]
public IActionResult Update([FromBody] {ModelName}Dto parm) public IActionResult Update([FromBody] {ModelName}Dto parm)
{ {
if (parm == null) if (parm == null)
@ -105,28 +104,27 @@ namespace ZRAdmin.Controllers
var updateModel = parm.Adapt<{ModelName}>().ToCreate(); var updateModel = parm.Adapt<{ModelName}>().ToCreate();
//updateModel.CreateID = User.Identity.Name; //updateModel.CreateID = User.Identity.Name;
var response = _{ServiceName}.Update(w => w.{primaryKey} == updateModel.{primaryKey}, it => new {ModelName}() var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == updateModel.{PrimaryKey}, it => new {ModelName}()
{ {
//TODO 字段映射 //TODO 字段映射
{updateColumn} {UpdateColumn}
}); });
return SUCCESS(response); return SUCCESS(response);
} }
/// <summary> /// <summary>
/// 删除{FileName} /// 删除{TableDesc}
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpDelete("{{primaryKey}}")] [HttpDelete("{{PrimaryKey}}")]
[ActionPermissionFilter(Permission = "{Permission}:delete")] [ActionPermissionFilter(Permission = "{Permission}:delete")]
[Log(Title = "{FileName}删除", BusinessType = BusinessType.DELETE)] [Log(Title = "{TableDesc}删除", BusinessType = BusinessType.DELETE)]
public IActionResult Delete({KeyTypeName} {primaryKey} = 0) public IActionResult Delete({KeyTypeName} {PrimaryKey} = 0)
{ {
if ({primaryKey} <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); } if ({PrimaryKey} <= 0) { return OutputJson(ApiResult.Error($"删除失败Id 不能为空")); }
// 删除{FileName} var response = _{ModelName}Service.Delete({PrimaryKey});
var response = _{ServiceName}.Delete({primaryKey});
return SUCCESS(response); return SUCCESS(response);
} }

4
ZR.Admin.WebApi/Template/VueJsTemplate.txt
View File

@ -4,11 +4,11 @@
* {ModelTypeDesc}分页查询 * {ModelTypeDesc}分页查询
* @param {查询条件} data * @param {查询条件} data
*/ */
export function list{ModelTypeName}(data) { export function list{ModelTypeName}(query) {
return request({ return request({
url: 'bus/{ModelTypeName}/list', url: 'bus/{ModelTypeName}/list',
method: 'get', method: 'get',
params: data, params: query,
}) })
} }

8
ZR.CodeGenerator/CodeGenerateTemplate.cs
View File

@ -8,10 +8,18 @@ using ZR.CodeGenerator.CodeGenerator;
namespace ZR.CodeGenerator namespace ZR.CodeGenerator
{ {
/// <summary>
/// 代码生成模板
/// </summary>
public class CodeGenerateTemplate public class CodeGenerateTemplate
{ {
#region Template #region Template
/// <summary>
/// 生成vuejs模板，目前只有上传文件方法
/// </summary>
/// <param name="dbColumnInfo"></param>
/// <returns></returns>
public static string GetVueJsMethod(DbColumnInfo dbColumnInfo) public static string GetVueJsMethod(DbColumnInfo dbColumnInfo)
{ {
string columnName = CodeGeneratorTool.FirstLowerCase(dbColumnInfo.DbColumnName); string columnName = CodeGeneratorTool.FirstLowerCase(dbColumnInfo.DbColumnName);

220
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -35,19 +35,18 @@ namespace ZR.CodeGenerator
/// <param name="dto"></param> /// <param name="dto"></param>
public static void Generate(DbTableInfo dbTableInfo, GenerateDto dto) public static void Generate(DbTableInfo dbTableInfo, GenerateDto dto)
{ {
//_option.BaseNamespace = baseNamespace; _option.BaseNamespace = "ZR.";
//_option.TableList = listTable; //_option.TableList = listTable;
_option.ReplaceTableNameStr = dto.replaceTableNameStr; _option.ReplaceTableNameStr = dto.replaceTableNameStr;
_option.DtosNamespace = "ZR.Model"; _option.DtosNamespace = _option.BaseNamespace + "Model";
_option.ModelsNamespace = "ZR.Model"; _option.ModelsNamespace = _option.BaseNamespace + "Model";
_option.RepositoriesNamespace = "ZR.Repository"; _option.RepositoriesNamespace = _option.BaseNamespace + "Repository";
_option.IRepositoriesNamespace = "ZR.Repository"; _option.IRepositoriesNamespace = _option.BaseNamespace + "Repository";
_option.IServicsNamespace = "ZR.Service"; _option.IServicsNamespace = _option.BaseNamespace + "Service";
_option.ServicesNamespace = "ZR.Service"; _option.ServicesNamespace = _option.BaseNamespace + "Service";
_option.ApiControllerNamespace = "ZR.Admin.WebApi"; _option.ApiControllerNamespace = _option.BaseNamespace + "Admin.WebApi";
CodeGeneraterService codeGeneraterService = new CodeGeneraterService();
CodeGeneraterService codeGeneraterService = new();
List<DbColumnInfo> listField = codeGeneraterService.GetColumnInfo(dto.dbName, dbTableInfo.Name); List<DbColumnInfo> listField = codeGeneraterService.GetColumnInfo(dto.dbName, dbTableInfo.Name);
GenerateSingle(listField, dbTableInfo, dto); GenerateSingle(listField, dbTableInfo, dto);
@ -59,12 +58,10 @@ namespace ZR.CodeGenerator
/// </summary> /// </summary>
/// <param name="listField">表字段集合</param> /// <param name="listField">表字段集合</param>
/// <param name="tableInfo">表信息</param> /// <param name="tableInfo">表信息</param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param> /// <param name="dto"></param>
public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, GenerateDto dto) public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, GenerateDto dto)
{ {
bool ifExsitedCovered = dto.coverd;
var modelTypeName = GetModelClassName(tableInfo.Name);//表名对应C# 实体类名 var modelTypeName = GetModelClassName(tableInfo.Name);//表名对应C# 实体类名
var modelTypeDesc = tableInfo.Description;//表描述
var primaryKey = "id";//主键 var primaryKey = "id";//主键
string keyTypeName = "int";//主键数据类型 string keyTypeName = "int";//主键数据类型
@ -115,30 +112,45 @@ namespace ZR.CodeGenerator
vueViewEditFromRuleContent += CodeGenerateTemplate.GetFormRules(dbFieldInfo); vueViewEditFromRuleContent += CodeGenerateTemplate.GetFormRules(dbFieldInfo);
InputDtoContent += CodeGenerateTemplate.GetDtoContent(dbFieldInfo); InputDtoContent += CodeGenerateTemplate.GetDtoContent(dbFieldInfo);
} }
ReplaceDto replaceDto = new();
replaceDto.KeyTypeName = keyTypeName;
replaceDto.PrimaryKey = primaryKey;
replaceDto.ModelTypeName = modelTypeName;
replaceDto.ModelProperty = modelContent;
replaceDto.TableName = tableInfo.Name;
replaceDto.TableDesc = tableInfo.Description;
replaceDto.InputDtoProperty = InputDtoContent;
replaceDto.updateColumn = updateColumn;
replaceDto.VueJsMethod = vueJsMethod;
replaceDto.VueViewEditFormContent = vueViewEditFromContent;
replaceDto.VueViewFormContent = vueViewFormContent;
replaceDto.VueViewEditFormRuleContent = vueViewEditFromRuleContent;
replaceDto.VueViewListContent = vueViewListContent;
if (dto.genFiles.Contains(1)) if (dto.genFiles.Contains(1))
{ {
GenerateModels(_option.ModelsNamespace, modelTypeName, tableInfo.Name, modelContent, modelTypeDesc, keyTypeName, ifExsitedCovered); GenerateModels(replaceDto, dto);
} }
if (dto.genFiles.Contains(2)) if (dto.genFiles.Contains(2))
{ {
GenerateInputDto(_option.ModelsNamespace, modelTypeName, modelTypeDesc, InputDtoContent, keyTypeName, ifExsitedCovered); GenerateInputDto(replaceDto, dto);
} }
if (dto.genFiles.Contains(3)) if (dto.genFiles.Contains(3))
{ {
GenerateRepository(modelTypeName, modelTypeDesc, tableInfo.Name, keyTypeName, ifExsitedCovered); GenerateRepository(replaceDto, dto);
} }
if (dto.genFiles.Contains(4)) if (dto.genFiles.Contains(4))
{ {
GenerateIService(_option.ModelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); GenerateIService(replaceDto, dto);
GenerateService(_option.ModelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); GenerateService(replaceDto, dto);
} }
if (dto.genFiles.Contains(5)) if (dto.genFiles.Contains(5))
{ {
GenerateControllers(modelTypeName, primaryKey, modelTypeDesc, keyTypeName, updateColumn, ifExsitedCovered); GenerateControllers(replaceDto, dto);
} }
if (dto.genFiles.Contains(6)) if (dto.genFiles.Contains(6))
{ {
GenerateVueViews(modelTypeName, primaryKey, modelTypeDesc, vueViewListContent, vueViewFormContent, vueViewEditFromContent, vueViewEditFromBindContent, vueViewSaveBindContent, vueViewEditFromRuleContent, vueJsMethod, ifExsitedCovered); GenerateVueViews(replaceDto, dto);
} }
//GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); //GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
//GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered); //GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered);
@ -157,28 +169,28 @@ namespace ZR.CodeGenerator
/// <param name="modelContent">数据库表实体内容</param> /// <param name="modelContent">数据库表实体内容</param>
/// <param name="keyTypeName">主键数据类型</param> /// <param name="keyTypeName">主键数据类型</param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param> /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateModels(string modelsNamespace, string modelTypeName, string tableName, string modelContent, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false) private static Tuple<string, string> GenerateModels(ReplaceDto replaceDto, GenerateDto generateDto)
{ {
var parentPath = ".."; var parentPath = "..";
//../ZR.Model //../ZR.Model
var servicesPath = parentPath + "\\" + modelsNamespace + "\\Models\\"; var servicesPath = parentPath + "\\" + _option.ModelsNamespace + "\\Models\\";
if (!Directory.Exists(servicesPath)) if (!Directory.Exists(servicesPath))
{ {
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
} }
// ../ZR.Model/Models/User.cs // ../ZR.Model/Models/User.cs
var fullPath = servicesPath + modelTypeName + ".cs"; var fullPath = servicesPath + replaceDto.ModelTypeName + ".cs";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); return Tuple.Create(fullPath, "");
var content = ReadTemplate("ModelTemplate.txt"); var content = ReadTemplate("ModelTemplate.txt");
content = content content = content
.Replace("{ModelsNamespace}", modelsNamespace) .Replace("{ModelsNamespace}", _option.ModelsNamespace)
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{TableNameDesc}", modelTypeDesc) .Replace("{TableNameDesc}", replaceDto.TableDesc)
.Replace("{KeyTypeName}", keyTypeName) .Replace("{KeyTypeName}", replaceDto.KeyTypeName)
.Replace("{PropertyName}", modelContent) .Replace("{PropertyName}", replaceDto.ModelProperty)
.Replace("{TableName}", tableName); .Replace("{TableName}", replaceDto.TableName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);
} }
@ -187,33 +199,29 @@ namespace ZR.CodeGenerator
/// <summary> /// <summary>
/// 生成InputDto文件 /// 生成InputDto文件
/// </summary> /// </summary>
/// <param name="modelsNamespace"></param> /// <param name="generateDto"></param>
/// <param name="modelTypeName"></param> /// <param name="replaceDto"></param>
/// <param name="modelTypeDesc"></param> private static Tuple<string, string> GenerateInputDto(ReplaceDto replaceDto, GenerateDto generateDto)
/// <param name="modelContent"></param>
/// <param name="keyTypeName"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateInputDto(string modelsNamespace, string modelTypeName, string modelTypeDesc, string modelContent, string keyTypeName, bool ifExsitedCovered = false)
{ {
var parentPath = ".."; var parentPath = "..";
var servicesPath = parentPath + "\\" + modelsNamespace + "\\Dto\\"; var servicesPath = parentPath + "\\" + _option.ModelsNamespace + "\\Dto\\";
if (!Directory.Exists(servicesPath)) if (!Directory.Exists(servicesPath))
{ {
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
} }
// ../ZR.Model/Dto/User.cs // ../ZR.Model/Dto/User.cs
var fullPath = servicesPath + modelTypeName + "Dto.cs"; var fullPath = servicesPath + replaceDto.ModelTypeName + "Dto.cs";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); ; return Tuple.Create(fullPath, ""); ;
var content = ReadTemplate("InputDtoTemplate.txt"); var content = ReadTemplate("InputDtoTemplate.txt");
content = content content = content
.Replace("{DtosNamespace}", _option.DtosNamespace) .Replace("{DtosNamespace}", _option.DtosNamespace)
.Replace("{ModelsNamespace}", modelsNamespace) .Replace("{ModelsNamespace}", _option.ModelsNamespace)
.Replace("{TableNameDesc}", modelTypeDesc) .Replace("{TableNameDesc}", replaceDto.TableDesc)
.Replace("{KeyTypeName}", keyTypeName) .Replace("{KeyTypeName}", replaceDto.KeyTypeName)
.Replace("{PropertyName}", modelContent) .Replace("{PropertyName}", replaceDto.InputDtoProperty)
.Replace("{ModelTypeName}", modelTypeName); .Replace("{ModelTypeName}", replaceDto.ModelTypeName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);
} }
@ -229,7 +237,7 @@ namespace ZR.CodeGenerator
/// <param name="tableName">表名</param> /// <param name="tableName">表名</param>
/// <param name="keyTypeName"></param> /// <param name="keyTypeName"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param> /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateRepository(string modelTypeName, string modelTypeDesc, string tableName, string keyTypeName, bool ifExsitedCovered = false) private static Tuple<string, string> GenerateRepository(ReplaceDto replaceDto, GenerateDto generateDto)
{ {
var parentPath = ".."; var parentPath = "..";
var repositoryPath = parentPath + "\\" + _option.RepositoriesNamespace + "\\Repositories\\"; var repositoryPath = parentPath + "\\" + _option.RepositoriesNamespace + "\\Repositories\\";
@ -237,18 +245,18 @@ namespace ZR.CodeGenerator
{ {
Directory.CreateDirectory(repositoryPath); Directory.CreateDirectory(repositoryPath);
} }
var fullPath = repositoryPath + "\\" + modelTypeName + "Repository.cs"; var fullPath = repositoryPath + "\\" + replaceDto.ModelTypeName + "Repository.cs";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); return Tuple.Create(fullPath, "");
var content = ReadTemplate("RepositoryTemplate.txt"); var content = ReadTemplate("RepositoryTemplate.txt");
content = content.Replace("{ModelsNamespace}", _option.ModelsNamespace) content = content.Replace("{ModelsNamespace}", _option.ModelsNamespace)
//.Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace) //.Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace)
.Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace) .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace)
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{TableNameDesc}", modelTypeDesc) .Replace("{TableNameDesc}", replaceDto.TableDesc)
.Replace("{TableName}", tableName) .Replace("{TableName}", replaceDto.TableName)
.Replace("{KeyTypeName}", keyTypeName); .Replace("{KeyTypeName}", replaceDto.KeyTypeName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);
} }
@ -259,12 +267,7 @@ namespace ZR.CodeGenerator
/// <summary> /// <summary>
/// 生成IService文件 /// 生成IService文件
/// </summary> /// </summary>
/// <param name="modelsNamespace"></param> private static Tuple<string, string> GenerateIService(ReplaceDto replaceDto, GenerateDto generateDto)
/// <param name="modelTypeName"></param>
/// <param name="modelTypeDesc"></param>
/// <param name="keyTypeName"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateIService(string modelsNamespace, string modelTypeName, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
{ {
var parentPath = ".."; var parentPath = "..";
var iServicesPath = parentPath + "\\" + _option.IServicsNamespace + "\\Business\\IBusService\\"; var iServicesPath = parentPath + "\\" + _option.IServicsNamespace + "\\Business\\IBusService\\";
@ -272,18 +275,18 @@ namespace ZR.CodeGenerator
{ {
Directory.CreateDirectory(iServicesPath); Directory.CreateDirectory(iServicesPath);
} }
var fullPath = $"{iServicesPath}\\I{modelTypeName}Service.cs"; var fullPath = $"{iServicesPath}\\I{replaceDto.ModelTypeName}Service.cs";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); return Tuple.Create(fullPath, "");
var content = ReadTemplate("IServiceTemplate.txt"); var content = ReadTemplate("IServiceTemplate.txt");
content = content.Replace("{ModelsNamespace}", modelsNamespace) content = content.Replace("{ModelsNamespace}", _option.ModelsNamespace)
.Replace("{TableNameDesc}", modelTypeDesc) .Replace("{TableNameDesc}", replaceDto.TableDesc)
.Replace("{DtosNamespace}", _option.DtosNamespace) .Replace("{DtosNamespace}", _option.DtosNamespace)
.Replace("{IServicsNamespace}", _option.IServicsNamespace) .Replace("{IServicsNamespace}", _option.IServicsNamespace)
.Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace) .Replace("{RepositoriesNamespace}", _option.RepositoriesNamespace)
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{KeyTypeName}", keyTypeName); .Replace("{KeyTypeName}", replaceDto.KeyTypeName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);
} }
@ -291,12 +294,7 @@ namespace ZR.CodeGenerator
/// <summary> /// <summary>
/// 生成Service文件 /// 生成Service文件
/// </summary> /// </summary>
/// <param name="modelsNamespace"></param> private static Tuple<string, string> GenerateService(ReplaceDto replaceDto, GenerateDto generateDto)
/// <param name="modelTypeName"></param>
/// <param name="modelTypeDesc"></param>
/// <param name="keyTypeName"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateService(string modelsNamespace, string modelTypeName, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
{ {
var parentPath = ".."; var parentPath = "..";
var servicesPath = parentPath + "\\" + _option.ServicesNamespace + "\\Business\\"; var servicesPath = parentPath + "\\" + _option.ServicesNamespace + "\\Business\\";
@ -304,20 +302,20 @@ namespace ZR.CodeGenerator
{ {
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
} }
var fullPath = servicesPath + modelTypeName + "Service.cs"; var fullPath = servicesPath + replaceDto.ModelTypeName + "Service.cs";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); return Tuple.Create(fullPath, "");
var content = ReadTemplate("ServiceTemplate.txt"); var content = ReadTemplate("ServiceTemplate.txt");
content = content content = content
.Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace) .Replace("{IRepositoriesNamespace}", _option.IRepositoriesNamespace)
.Replace("{DtosNamespace}", _option.DtosNamespace) .Replace("{DtosNamespace}", _option.DtosNamespace)
.Replace("{IServicsNamespace}", _option.IServicsNamespace) .Replace("{IServicsNamespace}", _option.IServicsNamespace)
.Replace("{TableNameDesc}", modelTypeDesc) .Replace("{TableNameDesc}", replaceDto.TableDesc)
.Replace("{ModelsNamespace}", modelsNamespace) .Replace("{ModelsNamespace}", _option.ModelsNamespace)
.Replace("{ServicesNamespace}", _option.ServicesNamespace) .Replace("{ServicesNamespace}", _option.ServicesNamespace)
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{KeyTypeName}", keyTypeName); .Replace("{KeyTypeName}", replaceDto.KeyTypeName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);
} }
@ -328,12 +326,7 @@ namespace ZR.CodeGenerator
/// <summary> /// <summary>
/// 生成控制器ApiControllers文件 /// 生成控制器ApiControllers文件
/// </summary> /// </summary>
/// <param name="modelTypeName">实体类型名称</param> private static Tuple<string, string> GenerateControllers(ReplaceDto replaceDto, GenerateDto generateDto)
/// <param name="primaryKey">主键</param>
/// <param name="modelTypeDesc">实体描述</param>
/// <param name="keyTypeName"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateControllers(string modelTypeName, string primaryKey, string modelTypeDesc, string keyTypeName, string updateColumn, bool ifExsitedCovered = false)
{ {
var parentPath = ".."; var parentPath = "..";
var servicesPath = parentPath + "\\" + _option.ApiControllerNamespace + "\\Controllers\\business\\"; var servicesPath = parentPath + "\\" + _option.ApiControllerNamespace + "\\Controllers\\business\\";
@ -341,22 +334,21 @@ namespace ZR.CodeGenerator
{ {
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
} }
var fullPath = servicesPath + modelTypeName + "Controller.cs"; var fullPath = servicesPath + replaceDto.ModelTypeName + "Controller.cs";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); return Tuple.Create(fullPath, "");
var content = ReadTemplate("ControllersTemplate.txt"); var content = ReadTemplate("ControllersTemplate.txt");
content = content content = content
//.Replace("{DtosNamespace}", _option.DtosNamespace) .Replace("{ApiControllerNamespace}", _option.ApiControllerNamespace)
.Replace("{ControllerName}", modelTypeName) .Replace("{ServicesNamespace}", _option.ServicesNamespace)
.Replace("{ModelsNamespace}", _option.ModelsNamespace) .Replace("{ModelsNamespace}", _option.ModelsNamespace)
.Replace("{FileName}", modelTypeDesc) .Replace("{TableDesc}", replaceDto.TableDesc)
.Replace("{ServiceName}", modelTypeName + "Service") .Replace("{ModelName}", replaceDto.ModelTypeName)
.Replace("{ModelName}", modelTypeName) .Replace("{Permission}", replaceDto.ModelTypeName.ToLower())
.Replace("{Permission}", modelTypeName.ToLower()) .Replace("{PrimaryKey}", replaceDto.PrimaryKey)
.Replace("{primaryKey}", primaryKey) .Replace("{UpdateColumn}", replaceDto.updateColumn)
.Replace("{updateColumn}", updateColumn) .Replace("{KeyTypeName}", replaceDto.KeyTypeName);
.Replace("{KeyTypeName}", keyTypeName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);
} }
@ -365,55 +357,45 @@ namespace ZR.CodeGenerator
#region 生成Vue页面 #region 生成Vue页面
/// <summary> /// <summary>
/// 生成Vue页面 /// 生成Vue页面
/// </summary> private static Tuple<string, string> GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
/// <param name="modelTypeName">类名</param>
/// <param name="modelTypeDesc">表/类描述</param>
/// <param name="vueViewListContent"></param>
/// <param name="vueViewFromContent"></param>
/// <param name="vueViewEditFromContent"></param>
/// <param name="vueViewEditFromBindContent"></param>
/// <param name="vueViewSaveBindContent"></param>
/// <param name="vueViewEditFromRuleContent"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static Tuple<string, string> GenerateVueViews(string modelTypeName, string primaryKey, string modelTypeDesc, string vueViewListContent, string vueViewFromContent, string vueViewEditFromContent, string vueViewEditFromBindContent, string vueViewSaveBindContent, string vueViewEditFromRuleContent, string vueJsMethod, bool ifExsitedCovered = false)
{ {
//var parentPath = "..\\CodeGenerate";//若要生成到项目中将路径改成 “..\\ZR.Vue\\src” //var parentPath = "..\\CodeGenerate";//若要生成到项目中将路径改成 “..\\ZR.Vue\\src”
var parentPath = "..\\ZR.Vue\\src"; var parentPath = "..\\ZR.Vue\\src";
var servicesPath = parentPath + "\\views\\" + FirstLowerCase(modelTypeName); var servicesPath = parentPath + "\\views\\" + FirstLowerCase(replaceDto.ModelTypeName);
if (!Directory.Exists(servicesPath)) if (!Directory.Exists(servicesPath))
{ {
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
} }
var fullPath = servicesPath + "\\" + "index.vue"; var fullPath = servicesPath + "\\" + "index.vue";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); ; return Tuple.Create(fullPath, ""); ;
var content = ReadTemplate("VueTemplate.txt"); var content = ReadTemplate("VueTemplate.txt");
content = content content = content
.Replace("{fileClassName}", FirstLowerCase(modelTypeName)) .Replace("{fileClassName}", FirstLowerCase(replaceDto.ModelTypeName))
.Replace("{VueViewListContent}", vueViewListContent)//查询 table列 .Replace("{VueViewListContent}", replaceDto.VueViewListContent)//查询 table列
.Replace("{VueViewFormContent}", vueViewFromContent)//添加、修改表单 .Replace("{VueViewFormContent}", replaceDto.VueViewFormContent)//添加、修改表单
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{Permission}", modelTypeName.ToLower()) .Replace("{Permission}", replaceDto.ModelTypeName.ToLower())
.Replace("{VueViewEditFormContent}", vueViewEditFromContent) .Replace("{VueViewEditFormContent}", replaceDto.VueViewEditFormContent)
.Replace("{vueJsMethod}", vueJsMethod) .Replace("{vueJsMethod}", replaceDto.VueJsMethod)
//.Replace("{VueViewEditFromBindContent}", vueViewEditFromBindContent) //.Replace("{VueViewEditFromBindContent}", vueViewEditFromBindContent)
//.Replace("{VueViewSaveBindContent}", vueViewSaveBindContent) //.Replace("{VueViewSaveBindContent}", vueViewSaveBindContent)
.Replace("{primaryKey}", FirstLowerCase(primaryKey)) .Replace("{primaryKey}", FirstLowerCase(replaceDto.PrimaryKey))
.Replace("{VueViewEditFormRuleContent}", vueViewEditFromRuleContent);//添加、修改表单验证规则 .Replace("{VueViewEditFormRuleContent}", replaceDto.VueViewEditFormRuleContent);//添加、修改表单验证规则
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
//api js //api js
servicesPath = parentPath + "\\api\\"; servicesPath = parentPath + "\\api\\";
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
fullPath = servicesPath + "\\" + FirstLowerCase(modelTypeName) + ".js"; fullPath = servicesPath + "\\" + FirstLowerCase(replaceDto.ModelTypeName) + ".js";
Console.WriteLine(fullPath); Console.WriteLine(fullPath);
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !generateDto.coverd)
return Tuple.Create(fullPath, ""); return Tuple.Create(fullPath, "");
content = ReadTemplate("VueJsTemplate.txt"); content = ReadTemplate("VueJsTemplate.txt");
content = content content = content
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", replaceDto.ModelTypeName)
.Replace("{ModelTypeDesc}", modelTypeDesc); .Replace("{ModelTypeDesc}", replaceDto.TableDesc);
//.Replace("{fileClassName}", fileClassName) //.Replace("{fileClassName}", fileClassName)
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
return Tuple.Create(fullPath, content); return Tuple.Create(fullPath, content);

3
ZR.CodeGenerator/Model/GenerateDto.cs
View File

@ -29,6 +29,9 @@ namespace ZR.CodeGenerator.Model
/// 要生成的文件 /// 要生成的文件
/// </summary> /// </summary>
public int[] genFiles { get; set; } public int[] genFiles { get; set; }
/// <summary>
/// 如果目标文件存在，是否覆盖。默认为false
/// </summary>
public bool coverd { get; set; } = true; public bool coverd { get; set; } = true;
} }
} }

61
ZR.CodeGenerator/Model/ReplaceDto.cs Normal file
View File

@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.CodeGenerator.Model
{
public class ReplaceDto
{
//public string ModelsNamespace { get; set; }
//public string DtosNamespace { get; set; }
//public string RepositoriesNamespace { get; set; }
//public string IRepositoriesNamespace { get; set; }
//public string IServicsNamespace { get; set; }
//public string ServicesNamespace { get; set; }
/// <summary>
/// 主键字段
/// </summary>
public string PrimaryKey { get; set; }
/// <summary>
/// 主键类型
/// </summary>
public string KeyTypeName { get; set; }
/// <summary>
/// 控制器权限
/// </summary>
public string Permission { get; set; }
/// <summary>
/// C#类名
/// </summary>
public string ModelTypeName { get; set; }
/// <summary>
/// 数据库表名
/// </summary>
public string TableName { get; set; }
/// <summary>
/// 表描述、说明
/// </summary>
public string TableDesc { get; set; }
public string updateColumn { get; set; }
/// <summary>
/// 实体属性模板
/// </summary>
public string ModelProperty { get; set; }
/// <summary>
/// 输入Dto模板
/// </summary>
public string InputDtoProperty { get; set; }
//vue、api
public string VueViewEditFormContent { get; set; }
public string VueViewListContent { get; set; }
public string VueViewFormContent { get; set; }
public string VueJsMethod { get; set; }
public string VueViewEditFormRuleContent { get; set; }
}
}

2
ZR.Vue/src/router/index.js
View File

@ -44,7 +44,7 @@ export const constantRoutes = [
}, },
{ {
path: '/demo', path: '/demo',
component: (resolve) => require(['@/views/demo'], resolve), component: (resolve) => require(['@/views/gift/index'], resolve),
hidden: true hidden: true
}, },
{ {

41
ZRAdmin.xml
View File

@ -920,5 +920,46 @@
</summary> </summary>
<param name="services"></param> <param name="services"></param>
</member> </member>
<member name="T:ZRAdmin.Controllers.GiftController">
<summary>
代码自动生成
</summary>
</member>
<member name="F:ZRAdmin.Controllers.GiftController._GiftService">
<summary>
接口
</summary>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Query(ZR.Model.Dto.GiftQueryDto)">
<summary>
查询列表
</summary>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Get(System.Int32)">
<summary>
查询详情
</summary>
<param name="GiftId"></param>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Create(ZR.Model.Dto.GiftDto)">
<summary>
添加
</summary>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Update(ZR.Model.Dto.GiftDto)">
<summary>
更新
</summary>
<returns></returns>
</member>
<member name="M:ZRAdmin.Controllers.GiftController.Delete(System.Int32)">
<summary>
删除
</summary>
<returns></returns>
</member>
</members> </members>
</doc> </doc>

BIN
document/admin-sqlserver.sql
View File

Binary file not shown.