diff --git "a/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs" "b/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs"
index d69567f..f770c36 100644
--- "a/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs"
+++ "b/AntJob.Data/Entity/\344\275\234\344\270\232.Biz.cs"
@@ -293,7 +293,6 @@ namespace AntJob.Data.Entity
JobID = ID,
Start = start,
End = end,
- Step = step,
BatchSize = BatchSize,
};
@@ -301,8 +300,6 @@ namespace AntJob.Data.Entity
ti.ProcessID = pid;
ti.Client = $"{ip}@{pid}";
ti.Status = JobStatus.就绪;
- //根据数据任务设置的偏移量来计算任务项的偏移量
- ti.Offset = Offset;
ti.CreateTime = DateTime.Now;
ti.UpdateTime = DateTime.Now;
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 b7fec6c..cd2650d 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"
@@ -42,14 +42,6 @@ namespace AntJob.Data.Entity
[BindColumn("JobID", "作业", "")]
public Int32 JobID { get { return _JobID; } set { if (OnPropertyChanging(__.JobID, value)) { _JobID = value; OnPropertyChanged(__.JobID); } } }
- private Int64 _LinkID;
- /// <summary>关联任务。消息作业关联的生产任务</summary>
- [DisplayName("关联任务")]
- [Description("关联任务。消息作业关联的生产任务")]
- [DataObjectField(false, false, false, 0)]
- [BindColumn("LinkID", "关联任务。消息作业关联的生产任务", "")]
- public Int64 LinkID { get { return _LinkID; } set { if (OnPropertyChanging(__.LinkID, value)) { _LinkID = value; OnPropertyChanged(__.LinkID); } } }
-
private String _Client;
/// <summary>客户端。IP加进程</summary>
[DisplayName("客户端")]
@@ -74,14 +66,6 @@ namespace AntJob.Data.Entity
[BindColumn("End", "结束。小于，不等于", "")]
public DateTime End { get { return _End; } set { if (OnPropertyChanging(__.End, value)) { _End = value; OnPropertyChanged(__.End); } } }
- private Int32 _Step;
- /// <summary>步进。最大区间大小，秒</summary>
- [DisplayName("步进")]
- [Description("步进。最大区间大小，秒")]
- [DataObjectField(false, false, false, 0)]
- [BindColumn("Step", "步进。最大区间大小，秒", "")]
- public Int32 Step { get { return _Step; } set { if (OnPropertyChanging(__.Step, value)) { _Step = value; OnPropertyChanged(__.Step); } } }
-
private Int32 _BatchSize;
/// <summary>批大小</summary>
[DisplayName("批大小")]
@@ -90,14 +74,6 @@ namespace AntJob.Data.Entity
[BindColumn("BatchSize", "批大小", "")]
public Int32 BatchSize { get { return _BatchSize; } set { if (OnPropertyChanging(__.BatchSize, value)) { _BatchSize = value; OnPropertyChanged(__.BatchSize); } } }
- private Int32 _Offset;
- /// <summary>偏移。距离实时时间的秒数，部分业务不能跑到实时，秒</summary>
- [DisplayName("偏移")]
- [Description("偏移。距离实时时间的秒数，部分业务不能跑到实时，秒")]
- [DataObjectField(false, false, false, 0)]
- [BindColumn("Offset", "偏移。距离实时时间的秒数，部分业务不能跑到实时，秒", "")]
- public Int32 Offset { get { return _Offset; } set { if (OnPropertyChanging(__.Offset, value)) { _Offset = value; OnPropertyChanged(__.Offset); } } }
-
private Int32 _Total;
/// <summary>总数</summary>
[DisplayName("总数")]
@@ -240,13 +216,10 @@ namespace AntJob.Data.Entity
case __.ID : return _ID;
case __.AppID : return _AppID;
case __.JobID : return _JobID;
- case __.LinkID : return _LinkID;
case __.Client : return _Client;
case __.Start : return _Start;
case __.End : return _End;
- case __.Step : return _Step;
case __.BatchSize : return _BatchSize;
- case __.Offset : return _Offset;
case __.Total : return _Total;
case __.Success : return _Success;
case __.Error : return _Error;
@@ -273,13 +246,10 @@ namespace AntJob.Data.Entity
case __.ID : _ID = value.ToLong(); break;
case __.AppID : _AppID = value.ToInt(); break;
case __.JobID : _JobID = value.ToInt(); break;
- case __.LinkID : _LinkID = value.ToLong(); break;
case __.Client : _Client = Convert.ToString(value); break;
case __.Start : _Start = value.ToDateTime(); break;
case __.End : _End = value.ToDateTime(); break;
- case __.Step : _Step = value.ToInt(); break;
case __.BatchSize : _BatchSize = value.ToInt(); break;
- case __.Offset : _Offset = value.ToInt(); break;
case __.Total : _Total = value.ToInt(); break;
case __.Success : _Success = value.ToInt(); break;
case __.Error : _Error = value.ToInt(); break;
@@ -315,9 +285,6 @@ namespace AntJob.Data.Entity
/// <summary>作业</summary>
public static readonly Field JobID = FindByName(__.JobID);
- /// <summary>关联任务。消息作业关联的生产任务</summary>
- public static readonly Field LinkID = FindByName(__.LinkID);
-
/// <summary>客户端。IP加进程</summary>
public static readonly Field Client = FindByName(__.Client);
@@ -327,15 +294,9 @@ namespace AntJob.Data.Entity
/// <summary>结束。小于，不等于</summary>
public static readonly Field End = FindByName(__.End);
- /// <summary>步进。最大区间大小，秒</summary>
- public static readonly Field Step = FindByName(__.Step);
-
/// <summary>批大小</summary>
public static readonly Field BatchSize = FindByName(__.BatchSize);
- /// <summary>偏移。距离实时时间的秒数，部分业务不能跑到实时，秒</summary>
- public static readonly Field Offset = FindByName(__.Offset);
-
/// <summary>总数</summary>
public static readonly Field Total = FindByName(__.Total);
@@ -399,9 +360,6 @@ namespace AntJob.Data.Entity
/// <summary>作业</summary>
public const String JobID = "JobID";
- /// <summary>关联任务。消息作业关联的生产任务</summary>
- public const String LinkID = "LinkID";
-
/// <summary>客户端。IP加进程</summary>
public const String Client = "Client";
@@ -411,15 +369,9 @@ namespace AntJob.Data.Entity
/// <summary>结束。小于，不等于</summary>
public const String End = "End";
- /// <summary>步进。最大区间大小，秒</summary>
- public const String Step = "Step";
-
/// <summary>批大小</summary>
public const String BatchSize = "BatchSize";
- /// <summary>偏移。距离实时时间的秒数，部分业务不能跑到实时，秒</summary>
- public const String Offset = "Offset";
-
/// <summary>总数</summary>
public const String Total = "Total";
@@ -484,9 +436,6 @@ namespace AntJob.Data.Entity
/// <summary>作业</summary>
Int32 JobID { get; set; }
- /// <summary>关联任务。消息作业关联的生产任务</summary>
- Int64 LinkID { get; set; }
-
/// <summary>客户端。IP加进程</summary>
String Client { get; set; }
@@ -496,15 +445,9 @@ namespace AntJob.Data.Entity
/// <summary>结束。小于，不等于</summary>
DateTime End { get; set; }
- /// <summary>步进。最大区间大小，秒</summary>
- Int32 Step { get; set; }
-
/// <summary>批大小</summary>
Int32 BatchSize { get; set; }
- /// <summary>偏移。距离实时时间的秒数，部分业务不能跑到实时，秒</summary>
- Int32 Offset { get; set; }
-
/// <summary>总数</summary>
Int32 Total { get; set; }
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 f6574ed..5876ccc 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"
@@ -75,14 +75,6 @@ namespace AntJob.Data.Entity
[BindColumn("End", "结束。小于，不等于", "")]
public DateTime End { get { return _End; } set { if (OnPropertyChanging(__.End, value)) { _End = value; OnPropertyChanged(__.End); } } }
- private Int32 _Step;
- /// <summary>步进。最大区间大小，秒</summary>
- [DisplayName("步进")]
- [Description("步进。最大区间大小，秒")]
- [DataObjectField(false, false, false, 0)]
- [BindColumn("Step", "步进。最大区间大小，秒", "")]
- public Int32 Step { get { return _Step; } set { if (OnPropertyChanging(__.Step, value)) { _Step = value; OnPropertyChanged(__.Step); } } }
-
private Int32 _BatchSize;
/// <summary>批大小</summary>
[DisplayName("批大小")]
@@ -173,7 +165,6 @@ namespace AntJob.Data.Entity
case __.Client : return _Client;
case __.Start : return _Start;
case __.End : return _End;
- case __.Step : return _Step;
case __.BatchSize : return _BatchSize;
case __.Key : return _Key;
case __.Data : return _Data;
@@ -197,7 +188,6 @@ namespace AntJob.Data.Entity
case __.Client : _Client = Convert.ToString(value); break;
case __.Start : _Start = value.ToDateTime(); break;
case __.End : _End = value.ToDateTime(); break;
- case __.Step : _Step = value.ToInt(); break;
case __.BatchSize : _BatchSize = value.ToInt(); break;
case __.Key : _Key = Convert.ToString(value); break;
case __.Data : _Data = Convert.ToString(value); break;
@@ -238,9 +228,6 @@ namespace AntJob.Data.Entity
/// <summary>结束。小于，不等于</summary>
public static readonly Field End = FindByName(__.End);
- /// <summary>步进。最大区间大小，秒</summary>
- public static readonly Field Step = FindByName(__.Step);
-
/// <summary>批大小</summary>
public static readonly Field BatchSize = FindByName(__.BatchSize);
@@ -295,9 +282,6 @@ namespace AntJob.Data.Entity
/// <summary>结束。小于，不等于</summary>
public const String End = "End";
- /// <summary>步进。最大区间大小，秒</summary>
- public const String Step = "Step";
-
/// <summary>批大小</summary>
public const String BatchSize = "BatchSize";
@@ -353,9 +337,6 @@ namespace AntJob.Data.Entity
/// <summary>结束。小于，不等于</summary>
DateTime End { get; set; }
- /// <summary>步进。最大区间大小，秒</summary>
- Int32 Step { get; set; }
-
/// <summary>批大小</summary>
Int32 BatchSize { get; set; }
diff --git a/AntJob.Data/Model.xml b/AntJob.Data/Model.xml
index f05a56b..97f7f23 100644
--- a/AntJob.Data/Model.xml
+++ b/AntJob.Data/Model.xml
@@ -139,13 +139,10 @@
<Column Name="ID" DataType="Int64" Identity="True" PrimaryKey="True" Description="编号" />
<Column Name="AppID" DataType="Int32" Description="应用" />
<Column Name="JobID" DataType="Int32" Description="作业" />
- <Column Name="LinkID" DataType="Int64" Description="关联任务。消息作业关联的生产任务" />
<Column Name="Client" DataType="String" Description="客户端。IP加进程" />
<Column Name="Start" DataType="DateTime" Description="开始。大于等于" />
<Column Name="End" DataType="DateTime" Description="结束。小于，不等于" />
- <Column Name="Step" DataType="Int32" Description="步进。最大区间大小，秒" />
<Column Name="BatchSize" DataType="Int32" Description="批大小" />
- <Column Name="Offset" DataType="Int32" Description="偏移。距离实时时间的秒数，部分业务不能跑到实时，秒" />
<Column Name="Total" DataType="Int32" Description="总数" />
<Column Name="Success" DataType="Int32" Description="成功" />
<Column Name="Error" DataType="Int32" Description="错误" />
@@ -178,7 +175,6 @@
<Column Name="Client" DataType="String" Description="客户端。IP加进程" />
<Column Name="Start" DataType="DateTime" Description="开始。大于等于" />
<Column Name="End" DataType="DateTime" Description="结束。小于，不等于" />
- <Column Name="Step" DataType="Int32" Description="步进。最大区间大小，秒" />
<Column Name="BatchSize" DataType="Int32" Description="批大小" />
<Column Name="Key" DataType="String" Description="数据键" />
<Column Name="Data" DataType="String" Length="2000" Description="数据" />
diff --git a/AntJob.Server/AntService.cs b/AntJob.Server/AntService.cs
index 3deeaba..0d4cf99 100644
--- a/AntJob.Server/AntService.cs
+++ b/AntJob.Server/AntService.cs
@@ -524,7 +524,6 @@ namespace AntJob.Server
JobID = job.ID,
Start = task.Start,
End = task.End,
- Step = task.Step,
BatchSize = task.BatchSize,
Server = task.Server,
diff --git a/AntJob.Web/Areas/Ant/Views/JobError/_List_Data.cshtml b/AntJob.Web/Areas/Ant/Views/JobError/_List_Data.cshtml
index 64cf61b..6d18204 100644
--- a/AntJob.Web/Areas/Ant/Views/JobError/_List_Data.cshtml
+++ b/AntJob.Web/Areas/Ant/Views/JobError/_List_Data.cshtml
@@ -23,7 +23,6 @@
<th class="text-center hidden-md hidden-sm hidden-xs"><a href="@Html.Raw(page.GetSortUrl("ID"))">编号</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("AppID"))">应用</a></th>
<th class="text-center" style="min-width:134px;"><a href="@Html.Raw(page.GetSortUrl("TaskItemID"))">任务项</a></th>
- <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Step"))">步进</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("BatchSize"))">批大小</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Key"))">数据键</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("ErrorCode"))">错误码</a></th>
@@ -42,7 +41,6 @@
<td class="text-center hidden-md hidden-sm hidden-xs">@entity.ID</td>
<td><a href="Job?AppID=@entity.AppID">@entity.AppName</a></td>
<td><a href="JobTask?JobID=@entity.JobID">@entity.JobName</a></td>
- <td class="text-right">@entity.Step.ToString("n0")</td>
<td class="text-right">@entity.BatchSize.ToString("n0")</td>
<td>@entity.Key</td>
<td>@entity.ErrorCode</td>
diff --git a/AntJob.Web/Areas/Ant/Views/JobTask/_List_Data.cshtml b/AntJob.Web/Areas/Ant/Views/JobTask/_List_Data.cshtml
index 64d6e28..cac5093 100644
--- a/AntJob.Web/Areas/Ant/Views/JobTask/_List_Data.cshtml
+++ b/AntJob.Web/Areas/Ant/Views/JobTask/_List_Data.cshtml
@@ -24,7 +24,6 @@
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("TaskID"))">任务</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Start"))">开始</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Client"))">客户端</a></th>
- <th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Step"))">步进</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("BatchSize"))">批大小</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Total"))">总数</a></th>
<th class="text-center"><a href="@Html.Raw(page.GetSortUrl("Success"))">成功</a></th>
@@ -77,7 +76,6 @@
<td class="text-center"><a href="Job?ID=@entity.JobID">@entity.JobName</a></td>
<td>@entity.Start.ToFullString("")</td>
<td>@entity.Client</td>
- <td class="text-right">@entity.Step.ToString("n0")</td>
<td class="text-right">@entity.BatchSize.ToString("n0")</td>
<td class="text-right">@entity.Total.ToString("n0")</td>
<td class="text-right" style="color:forestgreen"><b>@entity.Success.ToString("n0")</b></td>