NewLife
/
AntJob
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

限制任务错误表的Remark字段长度

This commit is contained in:
智能大石头 2025-07-24 09:51:27 +08:00
parent f88dcae994
commit 257f5be922
8 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AntJob.Data/Ant.htm
View File

@ -1054,7 +1054,7 @@
<td></td>
<td></td>
<td></td>
<td>设置免打扰时间段，例如09:00-12:00,13:00-18:00</td>
<td>设置免打扰时间段，该时间段内不生成作业任务，例如09:00-12:00,13:00-18:00</td>
</tr>
<tr>
@ -1463,7 +1463,7 @@
<td>Remark</td>
<td>备注</td>
<td>String</td>
<td></td>
<td>500</td>
<td></td>
<td></td>
<td></td>
@ -1656,7 +1656,7 @@
<td>Remark</td>
<td>备注</td>
<td>String</td>
<td></td>
<td>2000</td>
<td></td>
<td></td>
<td></td>

10
AntJob.Data/Entity/作业.cs
View File

@ -286,11 +286,11 @@ public partial class Job
public DateTime LastTime { get => _LastTime; set { if (OnPropertyChanging("LastTime", value)) { _LastTime = value; OnPropertyChanged("LastTime"); } } }
private String _QuietTime;
/// <summary>免打扰。设置免打扰时间段，例如09:00-12:00,13:00-18:00</summary>
/// <summary>免打扰。设置免打扰时间段，该时间段内不生成作业任务，例如09:00-12:00,13:00-18:00</summary>
[DisplayName("免打扰")]
[Description("免打扰。设置免打扰时间段，例如09:00-12:00,13:00-18:00")]
[Description("免打扰。设置免打扰时间段，该时间段内不生成作业任务，例如09:00-12:00,13:00-18:00")]
[DataObjectField(false, false, true, 50)]
[BindColumn("QuietTime", "免打扰。设置免打扰时间段，例如09:00-12:00,13:00-18:00", "")]
[BindColumn("QuietTime", "免打扰。设置免打扰时间段，该时间段内不生成作业任务，例如09:00-12:00,13:00-18:00", "")]
public String QuietTime { get => _QuietTime; set { if (OnPropertyChanging("QuietTime", value)) { _QuietTime = value; OnPropertyChanged("QuietTime"); } } }
private String _Data;
@ -598,7 +598,7 @@ public partial class Job
/// <summary>最后时间。最后一次时间</summary>
public static readonly Field LastTime = FindByName("LastTime");
/// <summary>免打扰。设置免打扰时间段，例如09:00-12:00,13:00-18:00</summary>
/// <summary>免打扰。设置免打扰时间段，该时间段内不生成作业任务，例如09:00-12:00,13:00-18:00</summary>
public static readonly Field QuietTime = FindByName("QuietTime");
/// <summary>附加数据。执行作业任务时附带的数据，可以是Json配置，也可以是Sql模板或C#模板</summary>
@ -730,7 +730,7 @@ public partial class Job
/// <summary>最后时间。最后一次时间</summary>
public const String LastTime = "LastTime";
/// <summary>免打扰。设置免打扰时间段，例如09:00-12:00,13:00-18:00</summary>
/// <summary>免打扰。设置免打扰时间段，该时间段内不生成作业任务，例如09:00-12:00,13:00-18:00</summary>
public const String QuietTime = "QuietTime";
/// <summary>附加数据。执行作业任务时附带的数据，可以是Json配置，也可以是Sql模板或C#模板</summary>

10
AntJob.Data/Entity/作业任务.Biz.cs
View File

@ -23,6 +23,16 @@ public partial class JobTask : EntityBase<JobTask>
Meta.Modules.Add<TimeModule>();
Meta.Modules.Add<TraceModule>();
}
/// <summary>验证数据，通过抛出异常的方式提示验证失败。</summary>
/// <param name="isNew">是否插入</param>
public override void Valid(Boolean isNew)
{
// 如果没有脏数据，则不需要进行任何处理
if (!HasDirty) return;
this.TrimExtraLong(__.Remark);
}
#endregion
#region 扩展属性

2
AntJob.Data/Entity/作业任务.cs
View File

@ -235,7 +235,7 @@ public partial class JobTask
[Category("扩展")]
[DisplayName("备注")]
[Description("备注")]
[DataObjectField(false, false, true, -1)]
[DataObjectField(false, false, true, 500)]
[BindColumn("Remark", "备注", "")]
public String Remark { get => _Remark; set { if (OnPropertyChanging("Remark", value)) { _Remark = value; OnPropertyChanged("Remark"); } } }
#endregion

3
AntJob.Data/Entity/作业错误.Biz.cs
View File

@ -3,7 +3,6 @@ using System.Collections.Generic;
using NewLife;
using NewLife.Data;
using XCode;
using XCode.Membership;
namespace AntJob.Data.Entity;
@ -26,6 +25,8 @@ public partial class JobError : EntityBase<JobError>
// 如果没有脏数据，则不需要进行任何处理
if (!HasDirty) return;
this.TrimExtraLong(__.Remark);
//// 截断错误信息，避免过长
//var len = _.Message.Length;
//if (!Message.IsNullOrEmpty() && len > 0 && Message.Length > len) Message = Message.Substring(0, len);

2
AntJob.Data/Entity/作业错误.cs
View File

@ -153,7 +153,7 @@ public partial class JobError
[Category("扩展")]
[DisplayName("备注")]
[Description("备注")]
[DataObjectField(false, false, true, -1)]
[DataObjectField(false, false, true, 2000)]
[BindColumn("Remark", "备注", "")]
public String Remark { get => _Remark; set { if (OnPropertyChanging("Remark", value)) { _Remark = value; OnPropertyChanged("Remark"); } } }
#endregion

4
AntJob.Data/Model.xml
View File

@ -193,7 +193,7 @@
<Column Name="CreateTime" DataType="DateTime" Description="创建时间" Category="扩展" />
<Column Name="UpdateIP" DataType="String" Description="更新地址" Category="扩展" />
<Column Name="UpdateTime" DataType="DateTime" Description="更新时间" Category="扩展" />
<Column Name="Remark" DataType="String" Length="-1" Description="备注" Category="扩展" />
<Column Name="Remark" DataType="String" Length="500" Description="备注" Category="扩展" />
</Columns>
<Indexes>
<Index Columns="JobID,DataTime" />
@ -219,7 +219,7 @@
<Column Name="CreateTime" DataType="DateTime" Description="创建时间" Category="扩展" />
<Column Name="UpdateIP" DataType="String" Description="更新地址" Category="扩展" />
<Column Name="UpdateTime" DataType="DateTime" Description="更新时间" Category="扩展" />
<Column Name="Remark" DataType="String" Length="-1" Description="备注" Category="扩展" />
<Column Name="Remark" DataType="String" Length="2000" Description="备注" Category="扩展" />
</Columns>
<Indexes>
<Index Columns="AppID,ID" />

3
AntJob.Web/Areas/Ant/Controllers/JobErrorController.cs
View File

@ -3,7 +3,6 @@ using AntJob.Data.Entity;
using NewLife;
using NewLife.Cube;
using NewLife.Cube.Extensions;
using NewLife.Cube.ViewModels;
using NewLife.Web;
namespace AntJob.Web.Areas.Ant.Controllers;
@ -17,7 +16,7 @@ public class JobErrorController : AntEntityController<JobError>
static JobErrorController()
{
ListFields.RemoveField("DataTime", "End");
ListFields.AddListField("Message", null, "TraceId");
ListFields.AddListField("Remark", null, "TraceId");
ListFields.TraceUrl();
}