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

修改实体类名称

This commit is contained in:
大石头 2019-04-07 14:29:53 +08:00
parent 3bd7c427ba
commit 7dfd8173d4
11 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
AntJob.Data/Entity/作业.Biz.cs
View File

@ -220,15 +220,15 @@ namespace AntJob.Data.Entity
public Int32 DeleteItems()
{
// 每个作业保留1000行
var count = JobLog.FindCountByJobId(ID);
var count = JobTask.FindCountByJobId(ID);
if (count <= 1000) return 0;
var days = MaxRetain;
if (days <= 0) days = 3;
var last = JobLog.FindLastByJobId(ID, DateTime.Now.AddDays(-days));
var last = JobTask.FindLastByJobId(ID, DateTime.Now.AddDays(-days));
if (last == null) return 0;
return JobLog.DeleteByID(ID, last.ID);
return JobTask.DeleteByID(ID, last.ID);
}
#endregion
@ -239,9 +239,9 @@ namespace AntJob.Data.Entity
/// <param name="pid">申请任务的服务端进程ID</param>
/// <param name="count">要申请的任务个数</param>
/// <returns></returns>
public IList<JobLog> Acquire(String server, String ip, Int32 pid, Int32 count)
public IList<JobTask> Acquire(String server, String ip, Int32 pid, Int32 count)
{
var list = new List<JobLog>();
var list = new List<JobTask>();
if (!Enable) return list;
@ -258,7 +258,7 @@ namespace AntJob.Data.Entity
if (!TrySplit(start, step, out var end)) break;
// 创建新的分片
var ti = new JobLog
var ti = new JobTask
{
AppID = AppID,
JobID = ID,
@ -344,19 +344,19 @@ namespace AntJob.Data.Entity
/// <param name="pid">申请任务的服务端进程ID</param>
/// <param name="count">要申请的任务个数</param>
/// <returns></returns>
public IList<JobLog> AcquireOld(String server, String ip, Int32 pid, Int32 count)
public IList<JobTask> AcquireOld(String server, String ip, Int32 pid, Int32 count)
{
lock (this)
{
using (var ts = Meta.CreateTrans())
{
var list = new List<JobLog>();
var list = new List<JobTask>();
// 查找历史错误任务
if (ErrorDelay > 0)
{
var dt = DateTime.Now.AddSeconds(-ErrorDelay);
var list2 = JobLog.Search(ID, dt, MaxRetry, new[] { JobStatus.错误, JobStatus.取消 }, count);
var list2 = JobTask.Search(ID, dt, MaxRetry, new[] { JobStatus.错误, JobStatus.取消 }, count);
if (list2.Count > 0) list.AddRange(list2);
}
@ -364,7 +364,7 @@ namespace AntJob.Data.Entity
if (MaxTime > 0 && list.Count < count)
{
var dt = DateTime.Now.AddSeconds(-MaxTime);
var list2 = JobLog.Search(ID, dt, MaxRetry, new[] { JobStatus.就绪, JobStatus.抽取中, JobStatus.处理中 }, count - list.Count);
var list2 = JobTask.Search(ID, dt, MaxRetry, new[] { JobStatus.就绪, JobStatus.抽取中, JobStatus.处理中 }, count - list.Count);
if (list2.Count > 0) list.AddRange(list2);
}
if (list.Count > 0)
@ -395,7 +395,7 @@ namespace AntJob.Data.Entity
/// <param name="pid">申请任务的服务端进程ID</param>
/// <param name="count">要申请的任务个数</param>
/// <returns></returns>
public IList<JobLog> AcquireMessage(String topic, String server, String ip, Int32 pid, Int32 count)
public IList<JobTask> AcquireMessage(String topic, String server, String ip, Int32 pid, Int32 count)
{
// 消费消息时，保存主题
if (Topic != topic)
@ -404,7 +404,7 @@ namespace AntJob.Data.Entity
SaveAsync();
}
var list = new List<JobLog>();
var list = new List<JobTask>();
if (!Enable) return list;
@ -431,7 +431,7 @@ namespace AntJob.Data.Entity
i += msgList.Count;
// 创建新的分片
var ti = new JobLog
var ti = new JobTask
{
AppID = AppID,
JobID = ID,

26
AntJob.Data/Entity/作业日志.Biz.cs → AntJob.Data/Entity/作业任务.Biz.cs
View File

@ -8,11 +8,11 @@ using XCode;
namespace AntJob.Data.Entity
{
/// <summary>作业日志</summary>
public partial class JobLog : EntityBase<JobLog>
/// <summary>作业任务</summary>
public partial class JobTask : EntityBase<JobTask>
{
#region 对象操作
static JobLog()
static JobTask()
{
// 累加字段
var df = Meta.Factory.AdditionalFields;
@ -66,7 +66,7 @@ namespace AntJob.Data.Entity
/// <summary>根据编号查找</summary>
/// <param name="id">编号</param>
/// <returns>实体对象</returns>
public static JobLog FindByID(Int32 id)
public static JobTask FindByID(Int32 id)
{
if (id <= 0) return null;
@ -79,7 +79,7 @@ namespace AntJob.Data.Entity
/// <param name="jobid">作业</param>
/// <param name="status">状态</param>
/// <returns>实体列表</returns>
public static IList<JobLog> FindAllByIDAndJobIDAndStatus(Int32 id, Int32 jobid, JobStatus status)
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);
@ -91,7 +91,7 @@ namespace AntJob.Data.Entity
/// <param name="id">编号</param>
/// <param name="status">状态</param>
/// <returns>实体列表</returns>
public static IList<JobLog> FindAllByIDAndStatus(Int32 id, JobStatus status)
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);
@ -99,16 +99,16 @@ namespace AntJob.Data.Entity
return FindAll(_.ID == id & _.Status == status);
}
public static IList<JobLog> FindAllByAppID(Int32 appid)
public static IList<JobTask> FindAllByAppID(Int32 appid)
{
if (appid == 0) return new List<JobLog>();
if (appid == 0) return new List<JobTask>();
return FindAll(_.AppID == appid);
}
public static IList<JobLog> FindAllByJobId(Int32 jobid)
public static IList<JobTask> FindAllByJobId(Int32 jobid)
{
if (jobid == 0) return new List<JobLog>();
if (jobid == 0) return new List<JobTask>();
return FindAll(_.JobID == jobid);
}
@ -119,14 +119,14 @@ namespace AntJob.Data.Entity
/// <param name="jobid"></param>
/// <param name="createTime"></param>
/// <returns></returns>
public static JobLog FindLastByJobId(Int32 jobid, DateTime createTime)
public static JobTask FindLastByJobId(Int32 jobid, DateTime createTime)
{
return FindAll(_.JobID == jobid & _.CreateTime < createTime, _.CreateTime.Desc(), null, 0, 1).FirstOrDefault();
}
#endregion
#region 高级查询
public static IEnumerable<JobLog> Search(Int32 id, Int32 appid, Int32 jobid, JobStatus status, DateTime start, DateTime end, String client, String key, PageParameter p)
public static IEnumerable<JobTask> Search(Int32 id, Int32 appid, Int32 jobid, JobStatus status, DateTime start, DateTime end, String client, String key, PageParameter p)
{
var exp = new WhereExpression();
@ -148,7 +148,7 @@ namespace AntJob.Data.Entity
/// <param name="stats"></param>
/// <param name="count">要申请的任务个数</param>
/// <returns></returns>
public static IList<JobLog> Search(Int32 taskid, DateTime end, Int32 maxRetry, JobStatus[] stats, Int32 count)
public static IList<JobTask> Search(Int32 taskid, DateTime end, Int32 maxRetry, JobStatus[] stats, Int32 count)
{
var exp = new WhereExpression();
if (taskid > 0) exp &= _.JobID == taskid;

22
AntJob.Data/Entity/作业日志.cs → AntJob.Data/Entity/作业任务.cs
View File

@ -7,15 +7,15 @@ using XCode.DataAccessLayer;
namespace AntJob.Data.Entity
{
/// <summary>作业日志</summary>
/// <summary>作业任务</summary>
[Serializable]
[DataObject]
[Description("作业日志")]
[BindIndex("IX_JobLog_JobID_Status_Start", false, "JobID,Status,Start")]
[BindIndex("IX_JobLog_AppID_Client_Status", false, "AppID,Client,Status")]
[BindIndex("IX_JobLog_JobID_CreateTime", false, "JobID,CreateTime")]
[BindTable("JobLog", Description = "作业日志", ConnName = "Ant", DbType = DatabaseType.None)]
public partial class JobLog : IJobLog
[Description("作业任务")]
[BindIndex("IX_JobTask_JobID_Status_Start", false, "JobID,Status,Start")]
[BindIndex("IX_JobTask_AppID_Client_Status", false, "AppID,Client,Status")]
[BindIndex("IX_JobTask_JobID_CreateTime", false, "JobID,CreateTime")]
[BindTable("JobTask", Description = "作业任务", ConnName = "Ant", DbType = DatabaseType.None)]
public partial class JobTask : IJobTask
{
#region 属性
private Int32 _ID;
@ -333,7 +333,7 @@ namespace AntJob.Data.Entity
#endregion
#region 字段名
/// <summary>取得作业日志字段信息的快捷方式</summary>
/// <summary>取得作业任务字段信息的快捷方式</summary>
public partial class _
{
/// <summary>编号</summary>
@ -426,7 +426,7 @@ namespace AntJob.Data.Entity
static Field FindByName(String name) { return Meta.Table.FindByName(name); }
}
/// <summary>取得作业日志字段名称的快捷方式</summary>
/// <summary>取得作业任务字段名称的快捷方式</summary>
public partial class __
{
/// <summary>编号</summary>
@ -519,8 +519,8 @@ namespace AntJob.Data.Entity
#endregion
}
/// <summary>作业日志接口</summary>
public partial interface IJobLog
/// <summary>作业任务接口</summary>
public partial interface IJobTask
{
#region 属性
/// <summary>编号</summary>

4
AntJob.Data/Model.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Tables Version="9.11.7018.41220" Output="Entity" NameSpace="AntJob.Data.Entity" ConnName="Ant" BaseClass="EntityBase">
<Tables Version="9.11.7035.41052" 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="编号" />
@ -97,7 +97,7 @@
<Index Columns="AppID,Name" Unique="True" />
</Indexes>
</Table>
<Table Name="JobLog" Description="作业日志">
<Table Name="JobTask" Description="作业任务">
<Columns>
<Column Name="ID" DataType="Int32" Identity="True" PrimaryKey="True" Description="编号" />
<Column Name="AppID" DataType="Int32" Description="应用" />

26
AntJob.Server/AntService.cs
View File

@ -225,16 +225,16 @@ namespace AntJob.Server
/// <param name="topic">主题</param>
/// <returns></returns>
[Api(nameof(Acquire))]
public JobLog[] Acquire(String job, Int32 count)
public JobTask[] Acquire(String job, Int32 count)
{
job = job?.Trim();
if (job.IsNullOrEmpty()) return new JobLog[0];
if (job.IsNullOrEmpty()) return new JobTask[0];
if (!(Session["App"] is App app)) return new JobLog[0];
if (!(Session["App"] is App app)) return new JobTask[0];
// 应用停止发放作业
app = App.FindByID(app.ID) ?? app;
if (!app.Enable) return new JobLog[0];
if (!app.Enable) return new JobTask[0];
// 找到作业。为了确保能够快速拿到新的作业参数，这里做二次查询
var jb = app.Jobs.FirstOrDefault(e => e.Name == job);
@ -246,7 +246,7 @@ namespace AntJob.Server
if (jb == null) throw new XException($"应用[{app.ID}/{app.Name}]下未找到作业[{job}]");
if (jb.Step == 0 || jb.Start.Year <= 2000) throw new XException("作业[{0}/{1}]未设置开始时间或步进", jb.ID, jb.Name);
var list = new List<JobLog>();
var list = new List<JobTask>();
// 每分钟检查一下错误任务和中断任务
CheckErrorTask(app, jb, count, list);
@ -289,7 +289,7 @@ namespace AntJob.Server
return list.ToArray();
}
private void CheckErrorTask(App app, Job jb, Int32 count, List<JobLog> list)
private void CheckErrorTask(App app, Job jb, Int32 count, List<JobTask> list)
{
// 每分钟检查一下错误任务和中断任务
var nextKey = $"_NextAcquireOld_{jb.ID}";
@ -336,7 +336,7 @@ namespace AntJob.Server
var app = Session["App"] as App;
var ji = JobLog.FindByID(jobitemid);
var ji = JobTask.FindByID(jobitemid);
var job = ji?.Job;
//if (job == null) throw new Exception($"无效作业编号[jobIten={jobitemid}]无效");
@ -402,14 +402,14 @@ namespace AntJob.Server
/// <param name="item"></param>
/// <returns></returns>
[Api(nameof(Report))]
public Boolean Report(JobLog item)
public Boolean Report(JobTask item)
{
if (item == null || item.ID == 0) throw new InvalidOperationException("无效操作 JobItemID=" + item?.ID);
// 判断是否有权
var app = Session["App"] as App;
var ji = JobLog.FindByID(item.ID);
var ji = JobTask.FindByID(item.ID);
if (ji == null) throw new InvalidOperationException($"找不到任务[{item.ID}]");
var job = Job.FindByID(ji.JobID);
@ -475,7 +475,7 @@ namespace AntJob.Server
}
//private static readonly MsgRpcClient _MsgClient = new MsgRpcClient();
private void SetJobFinish(Job job, JobLog ji)
private void SetJobFinish(Job job, JobTask ji)
{
job.Total += ji.Total;
job.Success += ji.Success;
@ -508,7 +508,7 @@ namespace AntJob.Server
//job.Save();
}
private JobError SetJobError(IJob job, JobLog ji, IDictionary<String, Object> ps)
private JobError SetJobError(IJob job, JobTask ji, IDictionary<String, Object> ps)
{
var err = new JobError
{
@ -559,7 +559,7 @@ namespace AntJob.Server
#endregion
#region 动态步进
public static void AdjustStep(IJob job, JobLog ji, IExtend ext)
public static void AdjustStep(IJob job, JobTask ji, IExtend ext)
{
// 不许动态调节步进
if (job.StepRate == 0 || job.MinStep == job.MaxStep) return;
@ -662,7 +662,7 @@ namespace AntJob.Server
return online;
}
void UpdateOnline(IApp app, JobLog ji, INetSession ns)
void UpdateOnline(IApp app, JobTask ji, INetSession ns)
{
var online = GetOnline(app, ns);
online.Total += ji.Total;

8
AntJob.Web/AntJob.Web.csproj
View File

@ -92,7 +92,7 @@
<Compile Include="Areas\Ant\Controllers\AppOnlineController.cs" />
<Compile Include="Areas\Ant\Controllers\JobController.cs" />
<Compile Include="Areas\Ant\Controllers\JobErrorController.cs" />
<Compile Include="Areas\Ant\Controllers\JobLogController.cs" />
<Compile Include="Areas\Ant\Controllers\JobTaskController.cs" />
<Compile Include="Areas\Ant\Controllers\AppMessageController.cs" />
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
@ -107,9 +107,9 @@
<Content Include="Areas\Ant\Views\App\_List_Toolbar_Batch.cshtml" />
<Content Include="Areas\Ant\Views\JobError\_List_Data.cshtml" />
<Content Include="Areas\Ant\Views\JobError\_List_Search.cshtml" />
<Content Include="Areas\Ant\Views\JobLog\_List_Data.cshtml" />
<Content Include="Areas\Ant\Views\JobLog\_List_Search.cshtml" />
<Content Include="Areas\Ant\Views\JobLog\_List_Toolbar_Batch.cshtml" />
<Content Include="Areas\Ant\Views\JobTask\_List_Data.cshtml" />
<Content Include="Areas\Ant\Views\JobTask\_List_Search.cshtml" />
<Content Include="Areas\Ant\Views\JobTask\_List_Toolbar_Batch.cshtml" />
<Content Include="Areas\Ant\Views\AppMessage\_List_Data.cshtml" />
<Content Include="Areas\Ant\Views\AppMessage\_List_Search.cshtml" />
<Content Include="Areas\Ant\Views\Job\_List_Data.cshtml" />

2
AntJob.Web/Areas/Ant/Controllers/AppController.cs
View File

@ -71,7 +71,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
}
// 清空日志
var jobItems = JobLog.FindAllByAppID(appid);
var jobItems = JobTask.FindAllByAppID(appid);
foreach (var jobItem in jobItems)
{
jobItem.Delete();

18
AntJob.Web/Areas/Ant/Controllers/JobLogController.cs → AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs
View File

@ -9,21 +9,21 @@ using XCode.Membership;
namespace AntJob.Web.Areas.Ant.Controllers
{
/// <summary>作业日志</summary>
[DisplayName("作业日志")]
public class JobLogController : EntityController<JobLog>
/// <summary>作业任务</summary>
[DisplayName("作业任务")]
public class JobTaskController : EntityController<JobTask>
{
static JobLogController()
static JobTaskController()
{
MenuOrder = 70;
JobLog.Meta.Modules.Add<TimeModule>();
JobTask.Meta.Modules.Add<TimeModule>();
}
/// <summary>搜索数据集</summary>
/// <param name="p"></param>
/// <returns></returns>
protected override IEnumerable<JobLog> Search(Pager p)
protected override IEnumerable<JobTask> Search(Pager p)
{
var id = p["id"].ToInt(-1);
var jobid = p["JobID"].ToInt(-1);
@ -33,7 +33,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
var end = p["dtEnd"].ToDateTime();
var client = p["Client"];
return JobLog.Search(id, appid, jobid, status, start, end, client, p["q"], p);
return JobTask.Search(id, appid, jobid, status, start, end, client, p["q"], p);
}
/// <summary>修改状态</summary>
@ -44,7 +44,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
{
if (id > 0)
{
var dt = JobLog.FindByID(id);
var dt = JobTask.FindByID(id);
if (dt == null) throw new ArgumentNullException(nameof(id), "找不到任务 " + id);
dt.Status = JobStatus.取消;
@ -62,7 +62,7 @@ namespace AntJob.Web.Areas.Ant.Controllers
foreach (var item in ids)
{
var dt = JobLog.FindByID(item);
var dt = JobTask.FindByID(item);
if (dt != null)
{
dt.Status = JobStatus.取消;

0
AntJob.Web/Areas/Ant/Views/JobLog/_List_Data.cshtml → AntJob.Web/Areas/Ant/Views/JobTask/_List_Data.cshtml
View File

0
AntJob.Web/Areas/Ant/Views/JobLog/_List_Search.cshtml → AntJob.Web/Areas/Ant/Views/JobTask/_List_Search.cshtml
View File

0
AntJob.Web/Areas/Ant/Views/JobLog/_List_Toolbar_Batch.cshtml → AntJob.Web/Areas/Ant/Views/JobTask/_List_Toolbar_Batch.cshtml
View File