From 9a93282ce73ab34a9ce867da0b02edcd2dca38a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Thu, 7 Dec 2023 21:27:46 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/CodeGenTemplate/TplControllers.txt | 2 +- .../wwwroot/CodeGenTemplate/TplService.txt | 2 +- ZR.CodeGenerator/CodeGeneratorTool.cs | 3 ++- ZR.CodeGenerator/Model/ReplaceDto.cs | 1 + ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs | 15 ++++++--------- ZR.ServiceCore/Model/Generate/GenTable.cs | 4 ++++ ZR.ServiceCore/Services/GenTableService.cs | 2 +- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt index bf94f8b..2536570 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplControllers.txt @@ -118,7 +118,7 @@ $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel) long[] idsArr = Tools.SpitLongArrary(ids); if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } - var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr); + var response = _${replaceDto.ModelTypeName}Service.Delete(idsArr$if(replaceDto.enableLog), "删除${genTable.FunctionName}"$end); return ToResponse(response); } diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt index 523bf05..4471574 100644 --- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt +++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt @@ -122,7 +122,7 @@ ${end} $if(null != genTable.SubTableName && "" != genTable.SubTableName) return Context.UpdateNav(model).Include(z1 => z1.${genTable.SubTable.ClassName}Nav).ExecuteCommand() ? 1 : 0; $else - return Update(model, true); + return Update(model, true$if(replaceDto.enableLog), "修改${genTable.FunctionName}"$end); $end } $if(replaceDto.ShowBtnTruncate) diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index d4ca473..d227669 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -54,7 +54,8 @@ namespace ZR.CodeGenerator ShowBtnImport = dto.GenTable.Options.CheckedBtn.Any(f => f == 8), ViewFileName = dto.GenTable.BusinessName.FirstUpperCase(), OperBtnStyle = dto.GenTable.Options.OperBtnStyle, - UseSnowflakeId = dto.GenTable.Options.UseSnowflakeId + UseSnowflakeId = dto.GenTable.Options.UseSnowflakeId, + EnableLog = dto.GenTable.Options.EnableLog }; var columns = dto.GenTable.Columns; diff --git a/ZR.CodeGenerator/Model/ReplaceDto.cs b/ZR.CodeGenerator/Model/ReplaceDto.cs index 030038e..32b61d8 100644 --- a/ZR.CodeGenerator/Model/ReplaceDto.cs +++ b/ZR.CodeGenerator/Model/ReplaceDto.cs @@ -78,5 +78,6 @@ namespace ZR.CodeGenerator.Model /// 是否使用雪花id /// public bool UseSnowflakeId { get; set; } + public bool EnableLog { get; set; } } } diff --git a/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs b/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs index 6eb8df6..a0c1ea5 100644 --- a/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs +++ b/ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs @@ -21,11 +21,11 @@ namespace ZR.Model.System.Dto public class SqlDiffLogDto { [Required(ErrorMessage = "主键不能为空")] - [ExcelColumn(Name = "主键")] + [ExcelColumn(Name = "主键", Width = 15)] [JsonConverter(typeof(ValueToStringConverter))] public long PId { get; set; } - [ExcelColumn(Name = "表名")] + [ExcelColumn(Name = "表名", Width = 15)] public string TableName { get; set; } [ExcelColumn(Name = "业务数据内容")] @@ -34,25 +34,22 @@ namespace ZR.Model.System.Dto [ExcelColumn(Name = "差异类型")] public string DiffType { get; set; } - [ExcelColumn(Name = "执行sql语句")] + [ExcelColumn(Name = "执行sql语句", Width = 30)] public string Sql { get; set; } - [ExcelColumn(Name = "变更前数据")] + [ExcelColumn(Name = "变更前数据", Width = 30)] public string BeforeData { get; set; } - [ExcelColumn(Name = "变更后数据")] + [ExcelColumn(Name = "变更后数据", Width = 30)] public string AfterData { get; set; } [ExcelColumn(Name = "操作用户名")] public string UserName { get; set; } - [ExcelColumn(Name = "AddTime", Format = "yyyy-MM-dd HH:mm:ss")] + [ExcelColumn(Name = "记录时间", Format = "yyyy-MM-dd HH:mm:ss", Width = 20)] public DateTime? AddTime { get; set; } [ExcelColumn(Name = "数据库配置id")] public string ConfigId { get; set; } - - - } } \ No newline at end of file diff --git a/ZR.ServiceCore/Model/Generate/GenTable.cs b/ZR.ServiceCore/Model/Generate/GenTable.cs index 6e2ceaa..e22dd92 100644 --- a/ZR.ServiceCore/Model/Generate/GenTable.cs +++ b/ZR.ServiceCore/Model/Generate/GenTable.cs @@ -136,5 +136,9 @@ namespace ZR.Model.System.Generate /// 是否使用雪花id /// public bool UseSnowflakeId { get; set; } = false; + /// + /// 是否启用日志(编辑、删除)自动记录日志 + /// + public bool EnableLog { get; set; } } } diff --git a/ZR.ServiceCore/Services/GenTableService.cs b/ZR.ServiceCore/Services/GenTableService.cs index 9450181..7d31777 100644 --- a/ZR.ServiceCore/Services/GenTableService.cs +++ b/ZR.ServiceCore/Services/GenTableService.cs @@ -48,7 +48,7 @@ namespace ZR.ServiceCore.Services if (info != null) { info.Columns = GenTableColumnService.GenTableColumns(tableId); - if (!info.SubTableName.IsEmpty()) + if (!info.SubTableName.IsEmpty() && info.SubTable != null) { info.SubTable = Queryable().Where(f => f.TableName == info.SubTableName).First(); info.SubTable.Columns = GenTableColumnService.GenTableColumns(info.SubTable.TableId);