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

JobTask.ID/AppMessage.ID改为Int64，避免Int32溢出

This commit is contained in:
大石头 2019-09-08 12:07:41 +08:00
parent a059d934a2
commit b30b546c1d
8 changed files with 26 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ namespace AntJob.Data.Entity
/// <summary>根据编号查找</summary>
/// <param name="id">编号</param>
/// <returns>实体对象</returns>
public static JobTask FindByID(Int32 id)
public static JobTask FindByID(Int64 id)
{
if (id <= 0) return null;
@ -74,31 +74,6 @@ namespace AntJob.Data.Entity
return Meta.SingleCache[id];
}
/// <summary>根据编号、作业、状态查找</summary>
/// <param name="id">编号</param>
/// <param name="jobid">作业</param>
/// <param name="status">状态</param>
/// <returns>实体列表</returns>
public static IList<JobTask> FindAllByIDAndJobIDAndStatus(Int32 id, Int32 jobid, JobStatus status)
{
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.ID == id && e.JobID == jobid && e.Status == status);
return FindAll(_.ID == id & _.JobID == jobid & _.Status == status);
}
/// <summary>根据编号、状态查找</summary>
/// <param name="id">编号</param>
/// <param name="status">状态</param>
/// <returns>实体列表</returns>
public static IList<JobTask> FindAllByIDAndStatus(Int32 id, JobStatus status)
{
// 实体缓存
if (Meta.Session.Count < 1000) return Meta.Cache.FindAll(e => e.ID == id && e.Status == status);
return FindAll(_.ID == id & _.Status == status);
}
public static IList<JobTask> FindAllByAppID(Int32 appid)
{
if (appid == 0) return new List<JobTask>();
@ -182,7 +157,7 @@ namespace AntJob.Data.Entity
/// <param name="jobid"></param>
/// <param name="maxid"></param>
/// <returns></returns>
public static Int32 DeleteByID(Int32 jobid, Int32 maxid) => maxid <= 0 ? 0 : Delete(_.JobID == jobid & _.ID <= maxid);
public static Int32 DeleteByID(Int32 jobid, Int64 maxid) => maxid <= 0 ? 0 : Delete(_.JobID == jobid & _.ID <= maxid);
public static Int32 DeleteByAppId(Int32 appid) => Delete(_.AppID == appid);

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

@ -18,13 +18,13 @@ namespace AntJob.Data.Entity
public partial class JobTask : IJobTask
{
#region 属性
private Int32 _ID;
private Int64 _ID;
/// <summary>编号</summary>
[DisplayName("编号")]
[Description("编号")]
[DataObjectField(true, true, false, 0)]
[BindColumn("ID", "编号", "")]
public Int32 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
public Int64 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
private Int32 _AppID;
/// <summary>应用</summary>
@ -42,13 +42,13 @@ namespace AntJob.Data.Entity
[BindColumn("JobID", "作业", "")]
public Int32 JobID { get { return _JobID; } set { if (OnPropertyChanging(__.JobID, value)) { _JobID = value; OnPropertyChanged(__.JobID); } } }
private Int32 _LinkID;
private Int64 _LinkID;
/// <summary>关联任务。消息作业关联的生产任务</summary>
[DisplayName("关联任务")]
[Description("关联任务。消息作业关联的生产任务")]
[DataObjectField(false, false, false, 0)]
[BindColumn("LinkID", "关联任务。消息作业关联的生产任务", "")]
public Int32 LinkID { get { return _LinkID; } set { if (OnPropertyChanging(__.LinkID, value)) { _LinkID = value; OnPropertyChanged(__.LinkID); } } }
public Int64 LinkID { get { return _LinkID; } set { if (OnPropertyChanging(__.LinkID, value)) { _LinkID = value; OnPropertyChanged(__.LinkID); } } }
private String _Client;
/// <summary>客户端。IP加进程</summary>
@ -270,10 +270,10 @@ namespace AntJob.Data.Entity
{
switch (name)
{
case __.ID : _ID = value.ToInt(); break;
case __.ID : _ID = value.ToLong(); break;
case __.AppID : _AppID = value.ToInt(); break;
case __.JobID : _JobID = value.ToInt(); break;
case __.LinkID : _LinkID = 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;
@ -476,7 +476,7 @@ namespace AntJob.Data.Entity
{
#region 属性
/// <summary>编号</summary>
Int32 ID { get; set; }
Int64 ID { get; set; }
/// <summary>应用</summary>
Int32 AppID { get; set; }
@ -485,7 +485,7 @@ namespace AntJob.Data.Entity
Int32 JobID { get; set; }
/// <summary>关联任务。消息作业关联的生产任务</summary>
Int32 LinkID { get; set; }
Int64 LinkID { get; set; }
/// <summary>客户端。IP加进程</summary>
String Client { get; set; }

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

@ -43,13 +43,13 @@ namespace AntJob.Data.Entity
[BindColumn("JobID", "作业", "")]
public Int32 JobID { get { return _JobID; } set { if (OnPropertyChanging(__.JobID, value)) { _JobID = value; OnPropertyChanged(__.JobID); } } }
private Int32 _TaskID;
private Int64 _TaskID;
/// <summary>作业项</summary>
[DisplayName("作业项")]
[Description("作业项")]
[DataObjectField(false, false, false, 0)]
[BindColumn("TaskID", "作业项", "")]
public Int32 TaskID { get { return _TaskID; } set { if (OnPropertyChanging(__.TaskID, value)) { _TaskID = value; OnPropertyChanged(__.TaskID); } } }
public Int64 TaskID { get { return _TaskID; } set { if (OnPropertyChanging(__.TaskID, value)) { _TaskID = value; OnPropertyChanged(__.TaskID); } } }
private String _Client;
/// <summary>客户端。IP加进程</summary>
@ -193,7 +193,7 @@ namespace AntJob.Data.Entity
case __.ID : _ID = value.ToInt(); break;
case __.AppID : _AppID = value.ToInt(); break;
case __.JobID : _JobID = value.ToInt(); break;
case __.TaskID : _TaskID = value.ToInt(); break;
case __.TaskID : _TaskID = value.ToLong(); break;
case __.Client : _Client = Convert.ToString(value); break;
case __.Start : _Start = value.ToDateTime(); break;
case __.End : _End = value.ToDateTime(); break;
@ -342,7 +342,7 @@ namespace AntJob.Data.Entity
Int32 JobID { get; set; }
/// <summary>作业项</summary>
Int32 TaskID { get; set; }
Int64 TaskID { get; set; }
/// <summary>客户端。IP加进程</summary>
String Client { get; set; }

2
AntJob.Data/Entity/应用消息.Biz.cs
View File

@ -50,7 +50,7 @@ namespace AntJob.Data.Entity
/// <summary>根据编号查找</summary>
/// <param name="id">编号</param>
/// <returns>实体对象</returns>
public static AppMessage FindByID(Int32 id)
public static AppMessage FindByID(Int64 id)
{
if (id <= 0) return null;

8
AntJob.Data/Entity/应用消息.cs
View File

@ -17,13 +17,13 @@ namespace AntJob.Data.Entity
public partial class AppMessage : IAppMessage
{
#region 属性
private Int32 _ID;
private Int64 _ID;
/// <summary>编号</summary>
[DisplayName("编号")]
[Description("编号")]
[DataObjectField(true, true, false, 0)]
[BindColumn("ID", "编号", "")]
public Int32 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
public Int64 ID { get { return _ID; } set { if (OnPropertyChanging(__.ID, value)) { _ID = value; OnPropertyChanged(__.ID); } } }
private Int32 _AppID;
/// <summary>应用</summary>
@ -98,7 +98,7 @@ namespace AntJob.Data.Entity
{
switch (name)
{
case __.ID : _ID = value.ToInt(); break;
case __.ID : _ID = value.ToLong(); break;
case __.AppID : _AppID = value.ToInt(); break;
case __.JobID : _JobID = value.ToInt(); break;
case __.Topic : _Topic = Convert.ToString(value); break;
@ -171,7 +171,7 @@ namespace AntJob.Data.Entity
{
#region 属性
/// <summary>编号</summary>
Int32 ID { get; set; }
Int64 ID { get; set; }
/// <summary>应用</summary>
Int32 AppID { get; set; }

10
AntJob.Data/Model.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Tables Version="9.11.7035.41052" Output="Entity" NameSpace="AntJob.Data.Entity" ConnName="Ant" BaseClass="EntityBase">
<Tables Version="9.14.7183.41843" Output="Entity" NameSpace="AntJob.Data.Entity" ConnName="Ant" BaseClass="EntityBase">
<Table Name="App" Description="应用系统。数据作业隶属于某个应用">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
@ -98,10 +98,10 @@
</Table>
<Table Name="JobTask" Description="作业任务">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
<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="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="结束。小于，不等于" />
@ -136,7 +136,7 @@
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
<Column Name="AppID" DataType="Int32" Description="应用" />
<Column Name="JobID" DataType="Int32" Description="作业" />
<Column Name="TaskID" DataType="Int32" Description="作业项" />
<Column Name="TaskID" DataType="Int64" Description="作业项" />
<Column Name="Client" DataType="String" Description="客户端。IP加进程" />
<Column Name="Start" DataType="DateTime" Description="开始。大于等于" />
<Column Name="End" DataType="DateTime" Description="结束。小于，不等于" />
@ -160,7 +160,7 @@
</Table>
<Table Name="AppMessage" Description="应用消息。消息调度，某些作业负责生产消息，供其它作业进行消费处理">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
<Column Name="ID" DataType="Int64" Identity="True" PrimaryKey="True" Description="编号" />
<Column Name="AppID" DataType="Int32" Description="应用" />
<Column Name="JobID" DataType="Int32" Description="作业。生产消息的作业" />
<Column Name="Topic" DataType="String" Description="主题。区分作业下多种消息" />

2
AntJob/Data/ITask.cs
View File

@ -6,7 +6,7 @@ namespace AntJob.Data
public interface ITask
{
/// <summary>任务项编号</summary>
Int32 ID { get; set; }
Int64 ID { get; set; }
/// <summary>开始。大于等于</summary>
DateTime Start { get; set; }

2
AntJob/Data/TaskModel.cs
View File

@ -7,7 +7,7 @@ namespace AntJob.Data
{
#region 属性
/// <summary>编号</summary>
public Int32 ID { get; set; }
public Int64 ID { get; set; }
/// <summary>开始。大于等于</summary>
public DateTime Start { get; set; }