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

优化代码生成功能

Browse Source
This commit is contained in:
不做码农 2021-12-14 21:50:30 +08:00
parent bb2f64088d
commit 50c48077d7
6 changed files with 126 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@ -157,19 +157,7 @@ namespace ZR.Admin.WebApi.Controllers
var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName); var tabInfo = _CodeGeneraterService.GetTableInfo(dbName, tableName);
if (tabInfo != null) if (tabInfo != null)
{ {
GenTable genTable = new() GenTable genTable = CodeGeneratorTool.InitTable(dbName, userName, tableName, tabInfo?.Description);
{
DbName = dbName,
BaseNameSpace = "ZR.",//导入默认命名空间前缀
ModuleName = "business",//导入默认模块名
ClassName = CodeGeneratorTool.GetClassName(tableName),
BusinessName = CodeGeneratorTool.GetBusinessName(tableName),
FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author),
TableName = tableName,
TableComment = tabInfo?.Description,
FunctionName = tabInfo?.Description,
Create_by = userName,
};
genTable.TableId = GenTableService.ImportGenTable(genTable); genTable.TableId = GenTableService.ImportGenTable(genTable);
if (genTable.TableId > 0) if (genTable.TableId > 0)
@ -256,7 +244,7 @@ namespace ZR.Admin.WebApi.Controllers
[HttpPost("genCode")] [HttpPost("genCode")]
[Log(Title = "代码生成", BusinessType = BusinessType.GENCODE)] [Log(Title = "代码生成", BusinessType = BusinessType.GENCODE)]
[ActionPermissionFilter(Permission = "tool:gen:code")] [ActionPermissionFilter(Permission = "tool:gen:code")]
public IActionResult Generate([FromBody] GenerateDto dto) public IActionResult CodeGenerate([FromBody] GenerateDto dto)
{ {
if (dto.TableId <= 0) if (dto.TableId <= 0)
{ {
@ -274,7 +262,6 @@ namespace ZR.Admin.WebApi.Controllers
//下载文件 //下载文件
FileHelper.ZipGenCode(dto); FileHelper.ZipGenCode(dto);
//HttpContext.Response.Headers.Add("Content-disposition", $"attachment; filename={zipFileName}");
return SUCCESS(new { path = "/Generatecode/" + dto.ZipFileName, fileName = dto.ZipFileName }); return SUCCESS(new { path = "/Generatecode/" + dto.ZipFileName, fileName = dto.ZipFileName });
} }

9
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt
View File

@ -101,14 +101,15 @@ $end
//从 Dto 映射到 实体 //从 Dto 映射到 实体
var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext); var model = parm.Adapt<${replaceDto.ModelTypeName}>().ToCreate(HttpContext);
return SUCCESS(_${replaceDto.ModelTypeName}Service.Insert(model, it => new var response = _${replaceDto.ModelTypeName}Service.Insert(model, it => new
{ {
$foreach(item in genTable.Columns) $foreach(item in genTable.Columns)
$if((item.IsInsert)) $if((item.IsInsert))
it.$item.CsharpField, it.$item.CsharpField,
$end $end
${end} ${end}
})); });
return ToResponse(response);
} }
/// <summary> /// <summary>
@ -137,7 +138,7 @@ $end
${end} ${end}
}); });
return SUCCESS(response); return ToResponse(response);
} }
/// <summary> /// <summary>
@ -154,7 +155,7 @@ ${end}
var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr); var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr);
return SUCCESS(response); return ToResponse(response);
} }
/// <summary> /// <summary>

28
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
View File

@ -302,31 +302,31 @@ $end
if (valid) { if (valid) {
$foreach(item in genTable.Columns) $foreach(item in genTable.Columns)
$if(item.HtmlType == "checkbox") $if(item.HtmlType == "checkbox")
this.form.${item.ColumnName} = this.form.${item.columnName}Checked.toString(); this.form.${item.ColumnName} = this.form.${item.columnName}Checked.toString();
$end $end
$end $end
console.log(JSON.stringify(this.form)); console.log(JSON.stringify(this.form));
if (this.form.${replaceDto.FistLowerPk} != undefined || this.title === "修改数据") { if (this.form.${replaceDto.FistLowerPk} != undefined && this.title === "修改数据") {
update${genTable.BusinessName}(this.form).then((res) => { update${genTable.BusinessName}(this.form)
if (!res.data) { .then((res) => {
this.msgError("修改失败");
return;
}
this.msgSuccess("修改成功"); this.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); })
.catch((err) => {
//TODO 错误逻辑
});
} else { } else {
add${genTable.BusinessName}(this.form).then((res) => { add${genTable.BusinessName}(this.form)
if (!res.data) { .then((res) => {
this.msgError("新增失败");
return;
}
this.msgSuccess("新增成功"); this.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); })
.catch((err) => {
//TODO 错误逻辑
});
} }
} }
}); });

192
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -37,15 +37,7 @@ namespace ZR.CodeGenerator
_option.ApiControllerNamespace = _option.BaseNamespace + "Admin.WebApi"; _option.ApiControllerNamespace = _option.BaseNamespace + "Admin.WebApi";
dto.GenOptions = _option; dto.GenOptions = _option;
GenerateSingle(dto);
}
/// <summary>
/// 单表生成代码
/// </summary>
/// <param name="dto"></param>
public static void GenerateSingle(GenerateDto dto)
{
string PKName = "Id"; string PKName = "Id";
string PKType = "int"; string PKType = "int";
ReplaceDto replaceDto = new(); ReplaceDto replaceDto = new();
@ -98,7 +90,7 @@ namespace ZR.CodeGenerator
} }
} }
#region 生成Model #region 读取模板
/// <summary> /// <summary>
/// 生成实体类Model /// 生成实体类Model
@ -128,9 +120,6 @@ namespace ZR.CodeGenerator
var result = tpl.Render(); var result = tpl.Render();
generateDto.GenCodes.Add(new GenCode(2, "Dto.cs", fullPath, result)); generateDto.GenCodes.Add(new GenCode(2, "Dto.cs", fullPath, result));
} }
#endregion
#region 生成Repository
/// <summary> /// <summary>
/// 生成Repository层代码文件 /// 生成Repository层代码文件
@ -146,10 +135,6 @@ namespace ZR.CodeGenerator
generateDto.GenCodes.Add(new GenCode(3, "Repository.cs", fullPath, result)); generateDto.GenCodes.Add(new GenCode(3, "Repository.cs", fullPath, result));
} }
#endregion
#region 生成Service
/// <summary> /// <summary>
/// 生成Service文件 /// 生成Service文件
/// </summary> /// </summary>
@ -166,9 +151,6 @@ namespace ZR.CodeGenerator
generateDto.GenCodes.Add(new GenCode(4, "IService.cs", fullPath2, result2)); generateDto.GenCodes.Add(new GenCode(4, "IService.cs", fullPath2, result2));
} }
#endregion
#region 生成Controller
/// <summary> /// <summary>
/// 生成控制器ApiControllers文件 /// 生成控制器ApiControllers文件
/// </summary> /// </summary>
@ -181,11 +163,9 @@ namespace ZR.CodeGenerator
var result = tpl.Render(); var result = tpl.Render();
generateDto.GenCodes.Add(new GenCode(5, "Controller.cs", fullPath, result)); generateDto.GenCodes.Add(new GenCode(5, "Controller.cs", fullPath, result));
} }
#endregion
#region 生成Vue页面 & api
/// <summary> /// <summary>
/// 6、生成Vue页面 /// 生成Vue页面
private static void GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto) private static void GenerateVueViews(ReplaceDto replaceDto, GenerateDto generateDto)
{ {
var fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName, $"{generateDto.GenTable.BusinessName}.vue"); var fullPath = Path.Combine(generateDto.GenCodePath, "ZR.Vue", "src", "views", generateDto.GenTable.ModuleName, $"{generateDto.GenTable.BusinessName}.vue");
@ -200,8 +180,9 @@ namespace ZR.CodeGenerator
var result = tpl.Render(); var result = tpl.Render();
generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, result)); generateDto.GenCodes.Add(new GenCode(6, "index.vue", fullPath, result));
} }
/// <summary> /// <summary>
/// 7、生成vue页面api /// 生成vue页面api
/// </summary> /// </summary>
/// <param name="replaceDto"></param> /// <param name="replaceDto"></param>
/// <param name="generateDto"></param> /// <param name="generateDto"></param>
@ -215,10 +196,11 @@ namespace ZR.CodeGenerator
generateDto.GenCodes.Add(new GenCode(7, "api.js", fullPath, result)); generateDto.GenCodes.Add(new GenCode(7, "api.js", fullPath, result));
} }
#endregion /// <summary>
/// 生成SQL
#region 生成SQL /// </summary>
/// <param name="replaceDto"></param>
/// <param name="generateDto"></param>
public static void GenerateSql(ReplaceDto replaceDto, GenerateDto generateDto) public static void GenerateSql(ReplaceDto replaceDto, GenerateDto generateDto)
{ {
string fullPath = Path.Combine(generateDto.GenCodePath, generateDto.GenTable.BusinessName + ".sql"); string fullPath = Path.Combine(generateDto.GenCodePath, generateDto.GenTable.BusinessName + ".sql");
@ -277,10 +259,6 @@ namespace ZR.CodeGenerator
/// <returns>业务名</returns> /// <returns>业务名</returns>
public static string GetBusinessName(string tableName) public static string GetBusinessName(string tableName)
{ {
//int firstIndex = tableName.IndexOf("_");//_前缀长度
//int nameLength = tableName.Length;
//int subLength = (nameLength - lastIndex) - 1;
//string businessName = tableName[(lastIndex + 1)..];
return tableName.Substring(0, 1).ToUpper() + tableName[1..].Replace("_", ""); return tableName.Substring(0, 1).ToUpper() + tableName[1..].Replace("_", "");
} }
@ -334,6 +312,34 @@ namespace ZR.CodeGenerator
} }
#endregion #endregion
#region 初始化信息
/// <summary>
/// 初始化表信息
/// </summary>
/// <param name="dbName"></param>
/// <param name="userName"></param>
/// <param name="tableName"></param>
/// <param name="desc"></param>
/// <returns></returns>
public static GenTable InitTable(string dbName, string userName, string tableName, string desc)
{
GenTable genTable = new()
{
DbName = dbName,
BaseNameSpace = "ZR.",//导入默认命名空间前缀
ModuleName = "business",//导入默认模块名
ClassName = GetClassName(tableName),
BusinessName = GetBusinessName(tableName),
FunctionAuthor = ConfigUtils.Instance.GetConfig(GenConstants.Gen_author),
TableName = tableName,
TableComment = desc,
FunctionName = desc,
Create_by = userName,
};
return genTable;
}
/// <summary> /// <summary>
/// 初始化列属性字段数据 /// 初始化列属性字段数据
/// </summary> /// </summary>
@ -344,68 +350,76 @@ namespace ZR.CodeGenerator
List<GenTableColumn> genTableColumns = new(); List<GenTableColumn> genTableColumns = new();
foreach (var column in dbColumnInfos) foreach (var column in dbColumnInfos)
{ {
GenTableColumn genTableColumn = new() genTableColumns.Add(InitColumnField(genTable, column));
{
ColumnName = FirstLowerCase(column.DbColumnName),
ColumnComment = column.ColumnDescription,
IsPk = column.IsPrimarykey,
ColumnType = column.DataType,
TableId = genTable.TableId,
TableName = genTable.TableName,
CsharpType = GetCSharpDatatype(column.DataType),
CsharpField = column.DbColumnName.Substring(0, 1).ToUpper() + column.DbColumnName[1..],
IsRequired = !column.IsNullable,
IsIncrement = column.IsIdentity,
Create_by = genTable.Create_by,
Create_time = DateTime.Now,
IsInsert = !column.IsIdentity,//非自增字段都需要插入
IsEdit = true,
IsQuery = false,
HtmlType = GenConstants.HTML_INPUT
};
if (GenConstants.imageFiled.Any(f => column.DbColumnName.ToLower().Contains(f.ToLower())))
{
genTableColumn.HtmlType = GenConstants.HTML_IMAGE_UPLOAD;
}
else if (GenConstants.COLUMNTYPE_TIME.Any(f => genTableColumn.CsharpType.ToLower().Contains(f.ToLower())))
{
genTableColumn.HtmlType = GenConstants.HTML_DATETIME;
}
else if (GenConstants.radioFiled.Any(f => column.DbColumnName.EndsWith(f, StringComparison.OrdinalIgnoreCase)) ||
GenConstants.radioFiled.Any(f => column.DbColumnName.StartsWith(f, StringComparison.OrdinalIgnoreCase)))
{
genTableColumn.HtmlType = GenConstants.HTML_RADIO;
}
else if (GenConstants.selectFiled.Any(f => column.DbColumnName == f) ||
GenConstants.selectFiled.Any(f => column.DbColumnName.EndsWith(f, StringComparison.OrdinalIgnoreCase)))
{
genTableColumn.HtmlType = GenConstants.HTML_SELECT;
}
else if (column.Length > 500)
{
genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
}
//编辑字段
if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)))
{
genTableColumn.IsEdit = false;
}
//列表字段
if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))
{
genTableColumn.IsList = true;
}
//时间类型初始化between范围查询
if (genTableColumn.CsharpType == GenConstants.TYPE_DATE)
{
genTableColumn.QueryType = "BETWEEN";
}
genTableColumns.Add(genTableColumn);
} }
return genTableColumns; return genTableColumns;
} }
private static GenTableColumn InitColumnField(GenTable genTable, DbColumnInfo column)
{
GenTableColumn genTableColumn = new()
{
ColumnName = FirstLowerCase(column.DbColumnName),
ColumnComment = column.ColumnDescription,
IsPk = column.IsPrimarykey,
ColumnType = column.DataType,
TableId = genTable.TableId,
TableName = genTable.TableName,
CsharpType = GetCSharpDatatype(column.DataType),
CsharpField = column.DbColumnName.Substring(0, 1).ToUpper() + column.DbColumnName[1..],
IsRequired = !column.IsNullable,
IsIncrement = column.IsIdentity,
Create_by = genTable.Create_by,
Create_time = DateTime.Now,
IsInsert = !column.IsIdentity,//非自增字段都需要插入
IsEdit = true,
IsQuery = false,
HtmlType = GenConstants.HTML_INPUT
};
if (GenConstants.imageFiled.Any(f => column.DbColumnName.ToLower().Contains(f.ToLower())))
{
genTableColumn.HtmlType = GenConstants.HTML_IMAGE_UPLOAD;
}
else if (GenConstants.COLUMNTYPE_TIME.Any(f => genTableColumn.CsharpType.ToLower().Contains(f.ToLower())))
{
genTableColumn.HtmlType = GenConstants.HTML_DATETIME;
}
else if (GenConstants.radioFiled.Any(f => column.DbColumnName.EndsWith(f, StringComparison.OrdinalIgnoreCase)) ||
GenConstants.radioFiled.Any(f => column.DbColumnName.StartsWith(f, StringComparison.OrdinalIgnoreCase)))
{
genTableColumn.HtmlType = GenConstants.HTML_RADIO;
}
else if (GenConstants.selectFiled.Any(f => column.DbColumnName == f) ||
GenConstants.selectFiled.Any(f => column.DbColumnName.EndsWith(f, StringComparison.OrdinalIgnoreCase)))
{
genTableColumn.HtmlType = GenConstants.HTML_SELECT;
}
else if (column.Length > 500)
{
genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
}
//编辑字段
if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)))
{
genTableColumn.IsEdit = false;
}
//列表字段
if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))
{
genTableColumn.IsList = true;
}
//时间类型初始化between范围查询
if (genTableColumn.CsharpType == GenConstants.TYPE_DATE)
{
genTableColumn.QueryType = "BETWEEN";
}
return genTableColumn;
}
#endregion
/// <summary> /// <summary>
/// 初始化Jnt模板 /// 初始化Jnt模板
/// </summary> /// </summary>

2
ZR.CodeGenerator/Service/CodeGeneraterService.cs
View File

@ -49,7 +49,7 @@ namespace ZR.CodeGenerator.Service
var tableList = GetSugarDbContext(dbName).DbMaintenance.GetTableInfoList(true); var tableList = GetSugarDbContext(dbName).DbMaintenance.GetTableInfoList(true);
if (!string.IsNullOrEmpty(tableName)) if (!string.IsNullOrEmpty(tableName))
{ {
return tableList.Where(f => f.Name.ToLower() == (tableName.ToLower())).FirstOrDefault(); return tableList.Where(f => f.Name.Equals(tableName, System.StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
} }
return null; return null;

2
ZR.Vue/src/utils/request.js
View File

@ -57,7 +57,7 @@ service.interceptors.response.use(res => {
}) })
return Promise.reject('无效的会话，或者会话已过期，请重新登录。') return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code == 0 || code == 110 || code == 101 || code == 403 || code == 500) { } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500) {
Message({ Message({
message: msg, message: msg,
type: 'error' type: 'error'