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

完成Model、Dto的代码生成

Browse Source
This commit is contained in:
izory
2021-09-08 07:48:18 +08:00
parent 85b0305cbc
commit 2d72257945
4 changed files with 127 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZR.Admin.WebApi/Template/InputDtoTemplate.txt
+20
View File
@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using {ModelsNamespace};
namespace {DtosNamespace}
{
/// <summary>
/// {TableNameDesc}输入对象模型
/// </summary>
public class {ModelTypeName}Dto
{
{PropertyName}
}
public class {ModelTypeName}QueryDto: PagerInfo
{
}
}
ZR.Admin.WebApi/Template/ModelTemplate.txt
+1 -1
View File
@@ -9,6 +9,6 @@ namespace {ModelsNamespace}
[SqlSugar.SugarTable("{TableName}")] [SqlSugar.SugarTable("{TableName}")]
public class {ModelTypeName} public class {ModelTypeName}
{ {
{ModelContent} {PropertyName}
} }
} }
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+3
View File
@@ -57,6 +57,9 @@
<Generator>TextTemplatingFileGenerator</Generator> <Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>Controller.cs</LastGenOutput> <LastGenOutput>Controller.cs</LastGenOutput>
</None> </None>
<None Update="Template\InputDtoTemplate.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Template\ModelTemplate.txt"> <None Update="Template\ModelTemplate.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
ZR.CodeGenerator/CodeGeneratorTool.cs
+103 -91
View File
@@ -39,7 +39,7 @@ namespace ZR.CodeGenerator
public static void Generate(string dbName, string baseNamespace, DbTableInfo dbTableInfo, string replaceTableNameStr, bool ifExsitedCovered = false) public static void Generate(string dbName, string baseNamespace, DbTableInfo dbTableInfo, string replaceTableNameStr, bool ifExsitedCovered = false)
{ {
_option.BaseNamespace = baseNamespace; _option.BaseNamespace = baseNamespace;
_option.DtosNamespace = baseNamespace + "ZR.Model.Dto"; _option.DtosNamespace = baseNamespace + "ZR.Model";
_option.ModelsNamespace = baseNamespace + "ZR.Model"; _option.ModelsNamespace = baseNamespace + "ZR.Model";
//_option.IRepositoriesNamespace = baseNamespace + ".IRepositorie"; //_option.IRepositoriesNamespace = baseNamespace + ".IRepositorie";
_option.RepositoriesNamespace = baseNamespace + "ZR.Repository"; _option.RepositoriesNamespace = baseNamespace + "ZR.Repository";
@@ -86,14 +86,8 @@ namespace ZR.CodeGenerator
public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, bool ifExsitedCovered = false) public static void GenerateSingle(List<DbColumnInfo> listField, DbTableInfo tableInfo, bool ifExsitedCovered = false)
{ {
var modelsNamespace = _option.ModelsNamespace; var modelsNamespace = _option.ModelsNamespace;
var modelTypeName = tableInfo.Name;//表名 var modelTypeName = GetModelName(tableInfo.Name); ;//表名
var modelTypeDesc = tableInfo.Description;//表描述 var modelTypeDesc = tableInfo.Description;//表描述
if (!string.IsNullOrEmpty(_option.ReplaceTableNameStr))
{
modelTypeName = modelTypeName.Replace(_option.ReplaceTableNameStr.ToString(), "");
}
modelTypeName = modelTypeName.Replace("_", "");
modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName.Substring(1);
string keyTypeName = "string";//主键数据类型 string keyTypeName = "string";//主键数据类型
string modelcontent = "";//数据库模型字段 string modelcontent = "";//数据库模型字段
@@ -121,104 +115,75 @@ namespace ZR.CodeGenerator
} }
modelcontent += $" public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r"; modelcontent += $" public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
//主键 //if (dbFieldInfo.DataType == "string")
//if (dbFieldInfo.IsIdentity)
//{ //{
//keyTypeName = dbFieldInfo.DataType; // outputDtocontent += string.Format(" [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
//outputDtocontent += " /// <summary>\n";
//outputDtocontent += string.Format(" /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
//outputDtocontent += " /// </summary>\n";
//outputDtocontent += string.Format(" [SqlSugar.SugarColumn(IsIdentity = true, IsPrimaryKey = true)]\n");
//outputDtocontent += string.Format(" public {0} {1}", TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType), columnName);
//outputDtocontent += " { get; set; }\n\r";
//} //}
// else //非主键 //outputDtocontent += string.Format(" public {0} {1}", dbFieldInfo.DataType, columnName);
//outputDtocontent += " { get; set; }\n\r";
//if (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint")
//{ //{
//modelcontent += " /// <summary>\n";
//modelcontent += string.Format(" /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
//modelcontent += " /// </summary>\n";
////if (dbFieldInfo.DataType == "string")
////{
//// modelcontent += string.Format(" [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
////}
//modelcontent += string.Format(" public {0} {1}", TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType), columnName);
//modelcontent += " { get; set; }\n\r";
// vueViewListContent += string.Format(" <el-table-column prop=\"{0}\" label=\"{1}\" sortable=\"custom\" width=\"120\" >\n", columnName, dbFieldInfo.ColumnDescription);
// vueViewListContent += " <template slot-scope=\"scope\">\n";
// vueViewListContent += string.Format(" <el-tag :type=\"scope.row.{0} === true ? 'success' : 'info'\" disable-transitions >", columnName);
// vueViewListContent += "{{ ";
// vueViewListContent += string.Format("scope.row.{0}===true?'启用':'禁用' ", columnName);
// vueViewListContent += "}}</el-tag>\n";
// vueViewListContent += " </template>\n";
// vueViewListContent += " </el-table-column>\n";
//outputDtocontent += " /// <summary>\n"; // vueViewFromContent += string.Format(" <el-form-item label=\"{0}\" :label-width=\"formLabelWidth\" prop=\"{1}\">", dbFieldInfo.ColumnDescription, columnName);
//outputDtocontent += string.Format(" /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription); // vueViewFromContent += string.Format(" <el-radio-group v-model=\"editFrom.{0}\">\n", columnName);
//outputDtocontent += " /// </summary>\n"; // vueViewFromContent += " <el-radio label=\"true\">是</el-radio>\n";
//if (dbFieldInfo.DataType == "string") // vueViewFromContent += " <el-radio label=\"false\">否</el-radio>\n";
//{ // vueViewFromContent += " </el-radio-group>\n";
// outputDtocontent += string.Format(" [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength); // vueViewFromContent += " </el-form-item>\n";
//}
//outputDtocontent += string.Format(" public {0} {1}", dbFieldInfo.DataType, columnName);
//outputDtocontent += " { get; set; }\n\r";
//if (dbFieldInfo.DataType == "bool" || dbFieldInfo.DataType == "tinyint")
//{
// vueViewListContent += string.Format(" <el-table-column prop=\"{0}\" label=\"{1}\" sortable=\"custom\" width=\"120\" >\n", columnName, dbFieldInfo.ColumnDescription); // vueViewEditFromContent += string.Format(" {0}: 'true',\n", columnName);
// vueViewListContent += " <template slot-scope=\"scope\">\n"; // vueViewEditFromBindContent += string.Format(" this.editFrom.{0} = res.ResData.{0}+''\n", columnName);
// vueViewListContent += string.Format(" <el-tag :type=\"scope.row.{0} === true ? 'success' : 'info'\" disable-transitions >", columnName); //}
// vueViewListContent += "{{ "; //else
// vueViewListContent += string.Format("scope.row.{0}===true?'启用':'禁用' ", columnName); //{
// vueViewListContent += "}}</el-tag>\n"; // vueViewListContent += string.Format(" <el-table-column prop=\"{0}\" label=\"{1}\" sortable=\"custom\" width=\"120\" />\n", columnName, dbFieldInfo.ColumnDescription);
// vueViewListContent += " </template>\n";
// vueViewListContent += " </el-table-column>\n";
// vueViewFromContent += string.Format(" <el-form-item label=\"{0}\" :label-width=\"formLabelWidth\" prop=\"{1}\">", dbFieldInfo.ColumnDescription, columnName); // vueViewFromContent += string.Format(" <el-form-item label=\"{0}\" :label-width=\"formLabelWidth\" prop=\"{1}\">\n", dbFieldInfo.ColumnDescription, columnName);
// vueViewFromContent += string.Format(" <el-radio-group v-model=\"editFrom.{0}\">\n", columnName); // vueViewFromContent += string.Format(" <el-input v-model=\"editFrom.{0}\" placeholder=\"请输入{1}\" autocomplete=\"off\" clearable />\n", columnName, dbFieldInfo.ColumnDescription);
// vueViewFromContent += " <el-radio label=\"true\">是</el-radio>\n"; // vueViewFromContent += " </el-form-item>\n";
// vueViewFromContent += " <el-radio label=\"false\">否</el-radio>\n"; // vueViewEditFromContent += string.Format(" {0}: '',\n", columnName);
// vueViewFromContent += " </el-radio-group>\n"; // vueViewEditFromBindContent += string.Format(" this.editFrom.{0} = res.ResData.{0}\n", columnName);
// vueViewFromContent += " </el-form-item>\n"; //}
//vueViewSaveBindContent += string.Format(" '{0}':this.editFrom.{0},\n", columnName);
//if (!dbFieldInfo.IsNullable)
//{
// vueViewEditFromRuleContent += string.Format(" {0}: [\n", columnName);
// vueViewEditFromRuleContent += " {";
// vueViewEditFromRuleContent += string.Format("required: true, message:\"请输入{0}\", trigger: \"blur\"", dbFieldInfo.ColumnDescription);
// vueViewEditFromRuleContent += "},\n { min: 2, max: 50, message: \"长度在 2 到 50 个字符\", trigger:\"blur\" }\n";
// vueViewEditFromRuleContent += " ],\n";
//}
// vueViewEditFromContent += string.Format(" {0}: 'true',\n", columnName);
// vueViewEditFromBindContent += string.Format(" this.editFrom.{0} = res.ResData.{0}+''\n", columnName);
//}
//else
//{
// vueViewListContent += string.Format(" <el-table-column prop=\"{0}\" label=\"{1}\" sortable=\"custom\" width=\"120\" />\n", columnName, dbFieldInfo.ColumnDescription);
// vueViewFromContent += string.Format(" <el-form-item label=\"{0}\" :label-width=\"formLabelWidth\" prop=\"{1}\">\n", dbFieldInfo.ColumnDescription, columnName);
// vueViewFromContent += string.Format(" <el-input v-model=\"editFrom.{0}\" placeholder=\"请输入{1}\" autocomplete=\"off\" clearable />\n", columnName, dbFieldInfo.ColumnDescription);
// vueViewFromContent += " </el-form-item>\n";
// vueViewEditFromContent += string.Format(" {0}: '',\n", columnName);
// vueViewEditFromBindContent += string.Format(" this.editFrom.{0} = res.ResData.{0}\n", columnName);
//}
//vueViewSaveBindContent += string.Format(" '{0}':this.editFrom.{0},\n", columnName);
//if (!dbFieldInfo.IsNullable)
//{
// vueViewEditFromRuleContent += string.Format(" {0}: [\n", columnName);
// vueViewEditFromRuleContent += " {";
// vueViewEditFromRuleContent += string.Format("required: true, message:\"请输入{0}\", trigger: \"blur\"", dbFieldInfo.ColumnDescription);
// vueViewEditFromRuleContent += "},\n { min: 2, max: 50, message: \"长度在 2 到 50 个字符\", trigger:\"blur\" }\n";
// vueViewEditFromRuleContent += " ],\n";
//}
}
//if (!inputDtoNoField.Contains(columnName) || columnName == "Id") //if (!inputDtoNoField.Contains(columnName) || columnName == "Id")
//{ //{
// InputDtocontent += " /// <summary>\n"; InputDtocontent += " /// <summary>\n";
// InputDtocontent += string.Format(" /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription); InputDtocontent += string.Format(" /// 设置或获取{0}\n", dbFieldInfo.ColumnDescription);
// InputDtocontent += " /// </summary>\n"; InputDtocontent += " /// </summary>\n";
// //if (dbFieldInfo.FieldType == "string") //if (dbFieldInfo.FieldType == "string")
// //{ //{
// // InputDtocontent += string.Format(" [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength); // InputDtocontent += string.Format(" [MaxLength({0})]\n", dbFieldInfo.FieldMaxLength);
// //} //}
// InputDtocontent += string.Format(" public {0} {1}", dbFieldInfo.DataType, columnName); InputDtocontent += $" public {TableMappingHelper.GetPropertyDatatype(dbFieldInfo.DataType)} {columnName} {{ get; set; }}\n\r";
// InputDtocontent += " { get; set; }\n\r";
//} //}
// //
//} }
GenerateModels(modelsNamespace, modelTypeName, tableInfo.Name, modelcontent, modelTypeDesc, keyTypeName, ifExsitedCovered); GenerateModels(modelsNamespace, modelTypeName, tableInfo.Name, modelcontent, modelTypeDesc, keyTypeName, ifExsitedCovered);
GenerateInputDto(modelsNamespace, modelTypeName, modelTypeDesc, InputDtocontent, keyTypeName, ifExsitedCovered);
//GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); //GenerateIRepository(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
//GenerateRepository(modelTypeName, modelTypeDesc, tableInfo.TableName, keyTypeName, ifExsitedCovered); //GenerateRepository(modelTypeName, modelTypeDesc, tableInfo.TableName, keyTypeName, ifExsitedCovered);
//GenerateIService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); //GenerateIService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
//GenerateService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); //GenerateService(modelsNamespace, modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
//GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered); //GenerateOutputDto(modelTypeName, modelTypeDesc, outputDtocontent, ifExsitedCovered);
//GenerateInputDto(modelsNamespace, modelTypeName, modelTypeDesc, InputDtocontent, keyTypeName, ifExsitedCovered);
//GenerateControllers(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered); //GenerateControllers(modelTypeName, modelTypeDesc, keyTypeName, ifExsitedCovered);
//GenerateVueViews(modelTypeName, modelTypeDesc, vueViewListContent, vueViewFromContent, vueViewEditFromContent, vueViewEditFromBindContent, vueViewSaveBindContent, vueViewEditFromRuleContent, ifExsitedCovered); //GenerateVueViews(modelTypeName, modelTypeDesc, vueViewListContent, vueViewFromContent, vueViewEditFromContent, vueViewEditFromBindContent, vueViewSaveBindContent, vueViewEditFromRuleContent, ifExsitedCovered);
} }
@@ -238,13 +203,15 @@ namespace ZR.CodeGenerator
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param> /// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static void GenerateModels(string modelsNamespace, string modelTypeName, string tableName, string modelContent, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false) private static void GenerateModels(string modelsNamespace, string modelTypeName, string tableName, string modelContent, string modelTypeDesc, string keyTypeName, bool ifExsitedCovered = false)
{ {
var parentPath = "..\\"; var parentPath = "..";
var servicesPath = parentPath + _option.BaseNamespace + "\\" + modelsNamespace; //../ZR.Model
var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + modelsNamespace;
if (!Directory.Exists(servicesPath)) if (!Directory.Exists(servicesPath))
{ {
servicesPath = parentPath + _option.ModelsNamespace; //servicesPath = parentPath + "\\" + _option.ModelsNamespace;
Directory.CreateDirectory(servicesPath); Directory.CreateDirectory(servicesPath);
} }
// ../ZR.Model/Models/User.cs
var fullPath = servicesPath + "\\Models\\" + modelTypeName + ".cs"; var fullPath = servicesPath + "\\Models\\" + modelTypeName + ".cs";
if (File.Exists(fullPath) && !ifExsitedCovered) if (File.Exists(fullPath) && !ifExsitedCovered)
return; return;
@@ -254,14 +221,59 @@ namespace ZR.CodeGenerator
.Replace("{ModelTypeName}", modelTypeName) .Replace("{ModelTypeName}", modelTypeName)
.Replace("{TableNameDesc}", modelTypeDesc) .Replace("{TableNameDesc}", modelTypeDesc)
.Replace("{KeyTypeName}", keyTypeName) .Replace("{KeyTypeName}", keyTypeName)
.Replace("{ModelContent}", modelContent) .Replace("{PropertyName}", modelContent)
.Replace("{TableName}", tableName); .Replace("{TableName}", tableName);
WriteAndSave(fullPath, content); WriteAndSave(fullPath, content);
} }
/// <summary>
/// 生成InputDto文件
/// </summary>
/// <param name="modelsNamespace"></param>
/// <param name="modelTypeName"></param>
/// <param name="modelTypeDesc"></param>
/// <param name="modelContent"></param>
/// <param name="keyTypeName"></param>
/// <param name="ifExsitedCovered">如果目标文件存在，是否覆盖。默认为false</param>
private static void GenerateInputDto(string modelsNamespace, string modelTypeName, string modelTypeDesc, string modelContent, string keyTypeName, bool ifExsitedCovered = false)
{
var parentPath = "..";
var servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\" + modelsNamespace;
if (!Directory.Exists(servicesPath))
{
//servicesPath = parentPath + "\\" + _option.BaseNamespace + "\\Dtos";
Directory.CreateDirectory(servicesPath);
}
// ../ZR.Model/Dto/User.cs
var fullPath = servicesPath + "\\Dto\\" + modelTypeName + "Dto.cs";
if (File.Exists(fullPath) && !ifExsitedCovered)
return;
var content = ReadTemplate("InputDtoTemplate.txt");
content = content
.Replace("{DtosNamespace}", _option.DtosNamespace)
.Replace("{ModelsNamespace}", modelsNamespace)
.Replace("{TableNameDesc}", modelTypeDesc)
.Replace("{KeyTypeName}", keyTypeName)
.Replace("{PropertyName}", modelContent)
.Replace("{ModelTypeName}", modelTypeName);
WriteAndSave(fullPath, content);
}
#endregion #endregion
#region 帮助方法 #region 帮助方法
private static string GetModelName(string modelTypeName)
{
if (!string.IsNullOrEmpty(_option.ReplaceTableNameStr))
{
modelTypeName = modelTypeName.Replace(_option.ReplaceTableNameStr.ToString(), "");
}
modelTypeName = modelTypeName.Replace("_", "");
modelTypeName = modelTypeName.Substring(0, 1).ToUpper() + modelTypeName.Substring(1);
return modelTypeName;
}
/// <summary> /// <summary>
/// 从代码模板中读取内容 /// 从代码模板中读取内容
/// </summary> /// </summary>