From 81f899654ca3f5b7c7f63da4aedaaeebc8fde6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= Date: Thu, 25 Jul 2024 14:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=80=97=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AntJob.Agent/AntJob.Agent.csproj | 2 +- AntJob.Data/AntJob.Data.csproj | 2 +- .../Entity/\344\275\234\344\270\232.cs" | 9 ++-- ...34\344\270\232\344\273\273\345\212\241.cs" | 41 +++++++++++++++++-- ...34\344\270\232\351\224\231\350\257\257.cs" | 3 ++ ...24\347\224\250\345\216\206\345\217\262.cs" | 16 +++++++- ...24\347\224\250\345\234\250\347\272\277.cs" | 5 ++- ...24\347\224\250\346\266\210\346\201\257.cs" | 25 ++++++++++- ...24\347\224\250\347\263\273\347\273\237.cs" | 3 ++ AntJob.Data/Model.xml | 18 ++++---- AntJob.Data/make.bat | 5 +++ AntJob.Extensions/AntJob.Extensions.csproj | 2 +- AntJob.Web/AntJob.Web.csproj | 4 +- AntJob.Web/Program.cs | 6 +-- AntJob/AntJob.csproj | 6 +-- Samples/HisData/HisData.csproj | 2 +- Samples/HisWeb/HisWeb.csproj | 2 +- 17 files changed, 118 insertions(+), 33 deletions(-) create mode 100644 AntJob.Data/make.bat diff --git a/AntJob.Agent/AntJob.Agent.csproj b/AntJob.Agent/AntJob.Agent.csproj index 73c16b0..6c8707a 100644 --- a/AntJob.Agent/AntJob.Agent.csproj +++ b/AntJob.Agent/AntJob.Agent.csproj @@ -32,7 +32,7 @@ - + diff --git a/AntJob.Data/AntJob.Data.csproj b/AntJob.Data/AntJob.Data.csproj index fa1ac0a..eef85fe 100644 --- a/AntJob.Data/AntJob.Data.csproj +++ b/AntJob.Data/AntJob.Data.csproj @@ -37,7 +37,7 @@ - + diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232.cs" index e042586..fcd98f4 100644 --- "a/AntJob.Data/Entity/\344\275\234\344\270\232.cs" +++ "b/AntJob.Data/Entity/\344\275\234\344\270\232.cs" @@ -175,7 +175,7 @@ public partial class Job [DisplayName("最大执行时间")] [Description("最大执行时间。默认600秒，超过该时间则认为执行器故障，将会把该任务分配给其它执行器")] [DataObjectField(false, false, false, 0)] - [BindColumn("MaxTime", "最大执行时间。默认600秒，超过该时间则认为执行器故障，将会把该任务分配给其它执行器", "")] + [BindColumn("MaxTime", "最大执行时间。默认600秒，超过该时间则认为执行器故障，将会把该任务分配给其它执行器", "", ItemType = "TimeSpan")] public Int32 MaxTime { get => _MaxTime; set { if (OnPropertyChanging("MaxTime", value)) { _MaxTime = value; OnPropertyChanged("MaxTime"); } } } private Int32 _MaxRetain; @@ -193,7 +193,7 @@ public partial class Job [DisplayName("最大空闲时间")] [Description("最大空闲时间。默认3600秒，超过该时间不更新则认为应用程序故障，系统触发告警")] [DataObjectField(false, false, false, 0)] - [BindColumn("MaxIdle", "最大空闲时间。默认3600秒，超过该时间不更新则认为应用程序故障，系统触发告警", "")] + [BindColumn("MaxIdle", "最大空闲时间。默认3600秒，超过该时间不更新则认为应用程序故障，系统触发告警", "", ItemType = "TimeSpan")] public Int32 MaxIdle { get => _MaxIdle; set { if (OnPropertyChanging("MaxIdle", value)) { _MaxIdle = value; OnPropertyChanged("MaxIdle"); } } } private Int32 _ErrorDelay; @@ -202,7 +202,7 @@ public partial class Job [DisplayName("错误延迟")] [Description("错误延迟。默认60秒，出错延迟后重新发放")] [DataObjectField(false, false, false, 0)] - [BindColumn("ErrorDelay", "错误延迟。默认60秒，出错延迟后重新发放", "")] + [BindColumn("ErrorDelay", "错误延迟。默认60秒，出错延迟后重新发放", "", ItemType = "TimeSpan")] public Int32 ErrorDelay { get => _ErrorDelay; set { if (OnPropertyChanging("ErrorDelay", value)) { _ErrorDelay = value; OnPropertyChanged("ErrorDelay"); } } } private DateTime _Deadline; @@ -478,6 +478,9 @@ public override Object this[String name] #endregion + #region 扩展查询 + #endregion + #region 字段名 /// 取得作业字段信息的快捷方式 public partial class _ diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.cs" index d9ac75a..7fe83e1 100644 --- "a/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.cs" +++ "b/AntJob.Data/Entity/\344\275\234\344\270\232\344\273\273\345\212\241.cs" @@ -61,7 +61,7 @@ public partial class JobTask [DisplayName("数据时间")] [Description("数据时间。大于等于，定时调度到达该时间点后触发（可能有偏移量），消息调度不适用")] [DataObjectField(false, false, true, 0)] - [BindColumn("DataTime", "数据时间。大于等于，定时调度到达该时间点后触发（可能有偏移量），消息调度不适用", "", Master = true)] + [BindColumn("DataTime", "数据时间。大于等于，定时调度到达该时间点后触发（可能有偏移量），消息调度不适用", "", DataScale = "time", Master = true)] public DateTime DataTime { get => _DataTime; set { if (OnPropertyChanging("DataTime", value)) { _DataTime = value; OnPropertyChanged("DataTime"); } } } private DateTime _End; @@ -125,7 +125,7 @@ public partial class JobTask [DisplayName("耗时")] [Description("耗时。秒，执行端计算的执行时间")] [DataObjectField(false, false, false, 0)] - [BindColumn("Cost", "耗时。秒，执行端计算的执行时间", "")] + [BindColumn("Cost", "耗时。秒，执行端计算的执行时间", "", ItemType = "TimeSpan")] public Int32 Cost { get => _Cost; set { if (OnPropertyChanging("Cost", value)) { _Cost = value; OnPropertyChanged("Cost"); } } } private Int32 _FullCost; @@ -133,7 +133,7 @@ public partial class JobTask [DisplayName("全部耗时")] [Description("全部耗时。秒，从任务发放到执行完成的时间")] [DataObjectField(false, false, false, 0)] - [BindColumn("FullCost", "全部耗时。秒，从任务发放到执行完成的时间", "")] + [BindColumn("FullCost", "全部耗时。秒，从任务发放到执行完成的时间", "", ItemType = "TimeSpan")] public Int32 FullCost { get => _FullCost; set { if (OnPropertyChanging("FullCost", value)) { _FullCost = value; OnPropertyChanged("FullCost"); } } } private JobStatus _Status; @@ -329,6 +329,41 @@ public override Object this[String name] #endregion + #region 扩展查询 + /// 根据编号查找 + /// 编号 + /// 实体对象 + public static JobTask FindByID(Int32 id) + { + if (id < 0) return null; + + return Find(_.ID == id); + } + + /// 根据作业查找 + /// 作业 + /// 实体列表 + public static IList FindAllByJobID(Int32 jobId) + { + if (jobId < 0) return []; + + return FindAll(_.JobID == jobId); + } + #endregion + + #region 数据清理 + /// 清理指定时间段内的数据 + /// 开始时间。未指定时清理小于指定时间的所有数据 + /// 结束时间 + /// 清理行数 + public static Int32 DeleteWith(DateTime start, DateTime end) + { + if (start == end) return Delete(_.DataTime == start); + + return Delete(_.DataTime.Between(start, end)); + } + #endregion + #region 字段名 /// 取得作业任务字段信息的快捷方式 public partial class _ diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.cs" index 51b8f0c..31396f0 100644 --- "a/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.cs" +++ "b/AntJob.Data/Entity/\344\275\234\344\270\232\351\224\231\350\257\257.cs" @@ -236,6 +236,9 @@ public override Object this[String name] #endregion + #region 扩展查询 + #endregion + #region 字段名 /// 取得作业错误字段信息的快捷方式 public partial class _ diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.cs" index 86b1436..2b1d236 100644 --- "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.cs" +++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\216\206\345\217\262.cs" @@ -27,7 +27,7 @@ public partial class AppHistory [DisplayName("编号")] [Description("编号")] [DataObjectField(true, false, false, 0)] - [BindColumn("Id", "编号", "")] + [BindColumn("Id", "编号", "", DataScale = "time")] public Int64 Id { get => _Id; set { if (OnPropertyChanging("Id", value)) { _Id = value; OnPropertyChanged("Id"); } } } private Int32 _AppID; @@ -178,6 +178,20 @@ public override Object this[String name] #endregion + #region 扩展查询 + #endregion + + #region 数据清理 + /// 清理指定时间段内的数据 + /// 开始时间。未指定时清理小于指定时间的所有数据 + /// 结束时间 + /// 清理行数 + public static Int32 DeleteWith(DateTime start, DateTime end) + { + return Delete(_.Id.Between(start, end, Meta.Factory.Snow)); + } + #endregion + #region 字段名 /// 取得应用历史字段信息的快捷方式 public partial class _ diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.cs" index 65babe6..0574c1b 100644 --- "a/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.cs" +++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\345\234\250\347\272\277.cs" @@ -133,7 +133,7 @@ public partial class AppOnline [DisplayName("耗时")] [Description("耗时。执行任务总耗时，秒")] [DataObjectField(false, false, false, 0)] - [BindColumn("Cost", "耗时。执行任务总耗时，秒", "")] + [BindColumn("Cost", "耗时。执行任务总耗时，秒", "", ItemType = "TimeSpan")] public Int64 Cost { get => _Cost; set { if (OnPropertyChanging("Cost", value)) { _Cost = value; OnPropertyChanged("Cost"); } } } private Int64 _Speed; @@ -271,6 +271,9 @@ public override Object this[String name] #endregion + #region 扩展查询 + #endregion + #region 字段名 /// 取得应用在线字段信息的快捷方式 public partial class _ diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.cs" index c796757..1d1eea5 100644 --- "a/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.cs" +++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\346\266\210\346\201\257.cs" @@ -27,7 +27,7 @@ public partial class AppMessage [DisplayName("编号")] [Description("编号")] [DataObjectField(true, false, false, 0)] - [BindColumn("Id", "编号", "")] + [BindColumn("Id", "编号", "", DataScale = "time")] public Int64 Id { get => _Id; set { if (OnPropertyChanging("Id", value)) { _Id = value; OnPropertyChanged("Id"); } } } private Int32 _AppID; @@ -167,6 +167,29 @@ public override Object this[String name] #endregion + #region 扩展查询 + /// 根据编号查找 + /// 编号 + /// 实体对象 + public static AppMessage FindById(Int64 id) + { + if (id < 0) return null; + + return Find(_.Id == id); + } + #endregion + + #region 数据清理 + /// 清理指定时间段内的数据 + /// 开始时间。未指定时清理小于指定时间的所有数据 + /// 结束时间 + /// 清理行数 + public static Int32 DeleteWith(DateTime start, DateTime end) + { + return Delete(_.Id.Between(start, end, Meta.Factory.Snow)); + } + #endregion + #region 字段名 /// 取得应用消息字段信息的快捷方式 public partial class _ diff --git "a/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.cs" "b/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.cs" index f04e593..e19e79b 100644 --- "a/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.cs" +++ "b/AntJob.Data/Entity/\345\272\224\347\224\250\347\263\273\347\273\237.cs" @@ -273,6 +273,9 @@ public override Object this[String name] #endregion + #region 扩展查询 + #endregion + #region 字段名 /// 取得应用系统字段信息的快捷方式 public partial class _ diff --git a/AntJob.Data/Model.xml b/AntJob.Data/Model.xml index 9d61a99..e8a330a 100644 --- a/AntJob.Data/Model.xml +++ b/AntJob.Data/Model.xml @@ -1,5 +1,5 @@  - +