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-29 18:39:42 +08:00
parent 8d4dff77f1
commit 1647f78196
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,6 +196,10 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult EditSave([FromBody] GenTableDto genTableDto) public IActionResult EditSave([FromBody] GenTableDto genTableDto)
{ {
if (genTableDto == null) throw new CustomException("请求参数错误"); if (genTableDto == null) throw new CustomException("请求参数错误");
if (genTableDto.BusinessName.Equals(genTableDto.ModuleName, StringComparison.OrdinalIgnoreCase))
{
return ToResponse(ResultCode.CUSTOM_ERROR, "模块名不能和业务名一样");
}
var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext); var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
genTable.Options = JsonConvert.SerializeObject(new genTable.Options = JsonConvert.SerializeObject(new
@ -204,17 +208,16 @@ namespace ZR.Admin.WebApi.Controllers
sortField = genTableDto.SortField, sortField = genTableDto.SortField,
sortType = genTable.SortType sortType = genTable.SortType
}); });
int updateCount = 0; DbResult<bool> result = GenTableService.UseTran(() =>
bool result = GenTableService.UseTran2(() =>
{ {
int rows = GenTableService.UpdateGenTable(genTable); int rows = GenTableService.UpdateGenTable(genTable);
if (rows > 0) if (rows > 0)
{ {
updateCount = GenTableColumnService.UpdateGenTableColumn(genTable.Columns); GenTableColumnService.UpdateGenTableColumn(genTable.Columns);
} }
}); });
return SUCCESS(updateCount); return SUCCESS(result.IsSuccess);
} }
/// <summary> /// <summary>

4
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -52,9 +52,9 @@ $end
$end $end
$end $end
$if(genTable.SortField != "" && genTable.SortField != null) $if(genTable.SortField != "" && genTable.SortField != null)
var response = Queryable().GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}"); var response = _${replaceDto.ModelTypeName}repository.GetPages(predicate.ToExpression(), parm, x => x.${genTable.SortField}, "${genTable.SortType}");
$else $else
var response = Queryable().Where(predicate.ToExpression()).ToPage(parm); var response = _${replaceDto.ModelTypeName}repository.Where(predicate.ToExpression()).ToPage(parm);
$end $end
return response; return response;
} }