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

✨代码生成新增记录日志配置

Browse Source
This commit is contained in:
不做码农 2023-12-07 21:27:46 +08:00
parent ae4bb658fd
commit 9a93282ce7
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

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

@ -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)

3
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -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;

1
ZR.CodeGenerator/Model/ReplaceDto.cs
View File

@ -78,5 +78,6 @@ namespace ZR.CodeGenerator.Model
/// 是否使用雪花id
/// </summary>
public bool UseSnowflakeId { get; set; }
public bool EnableLog { get; set; }
}
}

15
ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs
View File

@ -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; }
}
}

4
ZR.ServiceCore/Model/Generate/GenTable.cs
View File

@ -136,5 +136,9 @@ namespace ZR.Model.System.Generate
/// 是否使用雪花id
/// </summary>
public bool UseSnowflakeId { get; set; } = false;
/// <summary>
/// 是否启用日志(编辑、删除)自动记录日志
/// </summary>
public bool EnableLog { get; set; }
}
}

2
ZR.ServiceCore/Services/GenTableService.cs
View File

@ -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);