From 547be9b301cfcc4d9801fa7bd76ac1f73a522dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=BE=E9=BC=A0?= Date: Thu, 24 Jul 2025 09:32:06 +0000 Subject: [PATCH] =?UTF-8?q?update=20Admin.NET/Admin.NET.Core/Entity/SysJob?= =?UTF-8?q?Detail.cs.=20Length=E5=92=8C=20MaxLength=20=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=87=8D=E5=A4=8D;=20=E4=BF=9D=E6=8C=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=80=E8=87=B4=E6=80=A7:GroupName-JobGrou?= =?UTF-8?q?pName;=20Properties-AdditionalData(=E9=99=84=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE)\ExtraProperties(=E9=99=84=E5=8A=A0=E5=B1=9E=E6=80=A7?= =?UTF-8?q?);=20GroupName=20=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=20"defaul?= =?UTF-8?q?t"=EF=BC=8C=E4=BD=86=E6=9C=AA=E6=A0=87=E8=AE=B0=E4=B8=BA=20[Req?= =?UTF-8?q?uired]=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4;=20ColumnDataType=20=3D=20?= =?UTF-8?q?StaticConfig.CodeFirst=5FBigString=20=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=B7=BB=E5=8A=A0IsJson=20=3D=20true;=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dvirtual=20+=20Required=E5=86=B2=E7=AA=81;=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=B1=82=E9=9D=A2=EF=BC=88IsNullabl?= =?UTF-8?q?e=EF=BC=89=E5=BA=94=E8=AF=A5=E4=B8=8EC#=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=99=A8=E5=B1=82=E9=9D=A2=EF=BC=88string=3F=EF=BC=89=20?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 松鼠 --- .../Admin.NET.Core/Entity/SysJobDetail.cs | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs b/Admin.NET/Admin.NET.Core/Entity/SysJobDetail.cs index 3c2868f4f..8235b85d0 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 -- Gitee