From 7a8000c7290e103d109a3c5254a599ad6adc7b92 Mon Sep 17 00:00:00 2001 From: izory <791736813@qq.com> Date: Sat, 18 Sep 2021 18:13:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CodeGeneratorController.cs | 6 +-- .../Template/ControllersTemplate.txt | 6 +-- ZR.CodeGenerator/CodeGenerateTemplate.cs | 19 +++++---- ZR.CodeGenerator/CodeGeneratorTool.cs | 8 ++-- ZR.Model/System/Dto/GenTableDto.cs | 15 ------- ZR.Vue/src/views/tool/gen/index.vue | 8 ++-- ZRAdmin.xml | 41 +++++++++++++++++++ 7 files changed, 64 insertions(+), 39 deletions(-) diff --git a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs index 4287484..0a90337 100644 --- a/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/CodeGeneratorController.cs @@ -93,17 +93,17 @@ namespace ZR.Admin.WebApi.Controllers [ActionPermissionFilter(Permission = "tool:gen:code")] public IActionResult Generate([FromBody] GenerateDto dto) { - if (string.IsNullOrEmpty(dto.tableName) || dto.TableId <= 0) + if (dto.TableId <= 0) { throw new CustomException(ResultCode.CUSTOM_ERROR, "请求参数为空"); } var genTableInfo = GenTableService.GetGenTableInfo(dto.TableId); var getTableColumn = GenTableColumnService.GenTableColumns(dto.TableId); genTableInfo.Columns = getTableColumn; - DbTableInfo dbTableInfo = new() { Name = dto.tableName }; + //DbTableInfo dbTableInfo = new() { Name = dto.tableName }; CodeGeneratorTool.Generate(genTableInfo, dto); - return SUCCESS(dbTableInfo); + return SUCCESS(genTableInfo); } /// diff --git a/ZR.Admin.WebApi/Template/ControllersTemplate.txt b/ZR.Admin.WebApi/Template/ControllersTemplate.txt index 02131cb..b79a47f 100644 --- a/ZR.Admin.WebApi/Template/ControllersTemplate.txt +++ b/ZR.Admin.WebApi/Template/ControllersTemplate.txt @@ -81,7 +81,6 @@ namespace {ApiControllerNamespace}.Controllers } //从 Dto 映射到 实体 var addModel = parm.Adapt<{ModelName}>().ToCreate(); - //addModel.CreateID = User.Identity.Name; return SUCCESS(_{ModelName}Service.Add(addModel)); } @@ -100,12 +99,11 @@ namespace {ApiControllerNamespace}.Controllers throw new CustomException("请求实体不能为空"); } //从 Dto 映射到 实体 - var updateModel = parm.Adapt<{ModelName}>().ToCreate(); - //updateModel.CreateID = User.Identity.Name; + var updateModel = parm.Adapt<{ModelName}>().ToUpdate(); var response = _{ModelName}Service.Update(w => w.{PrimaryKey} == updateModel.{PrimaryKey}, it => new {ModelName}() { - //TODO 字段映射 + //Update 字段映射 {UpdateColumn} }); diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs index 56af855..da85852 100644 --- a/ZR.CodeGenerator/CodeGenerateTemplate.cs +++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs @@ -66,9 +66,9 @@ namespace ZR.CodeGenerator modelcontent += " /// \n"; if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement) { - modelcontent += $" [SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]\n"; + modelcontent += $"[SqlSugar.SugarColumn(IsPrimaryKey = {dbFieldInfo.IsPk.ToString().ToLower()}, IsIdentity = {dbFieldInfo.IsIncrement.ToString().ToLower()})]\n"; } - modelcontent += $" public {dbFieldInfo.CsharpType} {dbFieldInfo.CsharpField} {{ get; set; }}\n\r"; + modelcontent += $"public {dbFieldInfo.CsharpType} {dbFieldInfo.CsharpField} {{ get; set; }}\n\r"; return modelcontent; } //DTO model @@ -91,7 +91,10 @@ namespace ZR.CodeGenerator string vueViewFromContent = ""; string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : ""; string placeHolder = dbFieldInfo.IsIncrement ? "" : $"请输入{labelName}"; - + if (!dbFieldInfo.IsInsert || !dbFieldInfo.IsEdit) + { + return vueViewFromContent; + } if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME) { //时间 @@ -143,12 +146,11 @@ namespace ZR.CodeGenerator string label = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName); string vueViewListContent = ""; string showToolTip = dbFieldInfo.ColumnType.Contains("varchar") ? ":show-overflow-tooltip=\"true\"" : ""; - if (!dbFieldInfo.IsQuery) + if (!dbFieldInfo.IsList) { - return vueViewListContent; - } - if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) + } + else if (dbFieldInfo.HtmlType.Equals(GenConstants.HTML_IMAGE_UPLOAD)) { vueViewListContent += $" \n"; vueViewListContent += " - + - +