diff --git a/Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs b/Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs index 3c2868f4f5c131b6720656db5824465bdbf8290d..8235b85d06b86da166022e91c46e48539b063493 100644 --- a/Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs +++ b/Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs @@ -1,4 +1,4 @@ -// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 // // 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 // @@ -17,55 +17,52 @@ public partial class SysJobDetail : EntityBaseId /// /// 作业Id /// - [SugarColumn(ColumnDescription = "作业Id", Length = 64)] - [Required, MaxLength(64)] - public virtual string JobId { get; set; } + [SugarColumn(ColumnDescription = "作业Id", Length = 64, IsNullable = false)] + [Required] + public string JobId { get; set; } /// /// 组名称 /// - [SugarColumn(ColumnDescription = "组名称", Length = 128)] - [MaxLength(128)] - public string? GroupName { get; set; } = "default"; + [SugarColumn(ColumnDescription = "组名称", Length = 128, IsNullable = false)] + [Required] + public string JobGroupName { get; set; } = "default"; /// /// 作业类型FullName /// - [SugarColumn(ColumnDescription = "作业类型", Length = 128)] - [MaxLength(128)] + [SugarColumn(ColumnDescription = "作业类型", Length = 128, IsNullable = true)] public string? JobType { get; set; } /// /// 程序集Name /// - [SugarColumn(ColumnDescription = "程序集", Length = 128)] - [MaxLength(128)] + [SugarColumn(ColumnDescription = "程序集", Length = 128, IsNullable = true)] public string? AssemblyName { get; set; } /// /// 描述信息 /// - [SugarColumn(ColumnDescription = "描述信息", Length = 128)] - [MaxLength(128)] + [SugarColumn(ColumnDescription = "描述信息", Length = 128, IsNullable = true)] public string? Description { get; set; } /// /// 是否并行执行 /// - [SugarColumn(ColumnDescription = "是否并行执行")] + [SugarColumn(ColumnDescription = "是否并行执行"), IsNullable = false] public bool Concurrent { get; set; } = true; /// /// 是否扫描特性触发器 /// - [SugarColumn(ColumnDescription = "是否扫描特性触发器", ColumnName = "annotation")] + [SugarColumn(ColumnDescription = "是否扫描特性触发器", ColumnName = "annotation"), IsNullable = false] public bool IncludeAnnotation { get; set; } = false; /// /// 额外数据 /// - [SugarColumn(ColumnDescription = "额外数据", ColumnDataType = StaticConfig.CodeFirst_BigString)] - public string? Properties { get; set; } = "{}"; + [SugarColumn(ColumnDescription = "额外数据", ColumnDataType = StaticConfig.CodeFirst_BigString ,IsJson = true)] + public string? AdditionalData { get; set; } = "{}"; /// /// 更新时间 @@ -82,6 +79,6 @@ public partial class SysJobDetail : EntityBaseId /// /// 脚本代码 /// - [SugarColumn(ColumnDescription = "脚本代码", ColumnDataType = StaticConfig.CodeFirst_BigString)] + [SugarColumn(ColumnDescription = "脚本代码", ColumnDataType = StaticConfig.CodeFirst_BigString, IsNullable = false)] public string? ScriptCode { get; set; } } \ No newline at end of file