优化定时任务,新增简单定时任务
This commit is contained in:
parent
a47821fb69
commit
74bf025a65
@ -86,7 +86,7 @@ namespace ZR.Admin.WebApi.Controllers
|
|||||||
{
|
{
|
||||||
throw new CustomException($"添加 {parm.Name} 失败,该用任务存在,不能重复!");
|
throw new CustomException($"添加 {parm.Name} 失败,该用任务存在,不能重复!");
|
||||||
}
|
}
|
||||||
if (string.IsNullOrEmpty(parm.Cron) || !CronExpression.IsValidExpression(parm.Cron))
|
if (!string.IsNullOrEmpty(parm.Cron) && !CronExpression.IsValidExpression(parm.Cron))
|
||||||
{
|
{
|
||||||
throw new CustomException($"cron表达式不正确");
|
throw new CustomException($"cron表达式不正确");
|
||||||
}
|
}
|
||||||
@ -97,7 +97,7 @@ namespace ZR.Admin.WebApi.Controllers
|
|||||||
|
|
||||||
tasksQz.ID = worker.NextId().ToString();
|
tasksQz.ID = worker.NextId().ToString();
|
||||||
tasksQz.IsStart = false;
|
tasksQz.IsStart = false;
|
||||||
tasksQz.Create_by = User.Identity.Name;
|
tasksQz.Create_by = HttpContext.GetName();
|
||||||
|
|
||||||
return SUCCESS(_tasksQzService.Add(tasksQz));
|
return SUCCESS(_tasksQzService.Add(tasksQz));
|
||||||
}
|
}
|
||||||
@ -116,11 +116,11 @@ namespace ZR.Admin.WebApi.Controllers
|
|||||||
{
|
{
|
||||||
throw new CustomException($"更新 {parm.Name} 失败,该用任务存在,不能重复!");
|
throw new CustomException($"更新 {parm.Name} 失败,该用任务存在,不能重复!");
|
||||||
}
|
}
|
||||||
if (string.IsNullOrEmpty(parm.Cron))
|
if (string.IsNullOrEmpty(parm.Cron) && parm.TriggerType == 1)
|
||||||
{
|
{
|
||||||
throw new CustomException($"触发器 Corn 模式下,运行时间表达式必须填写");
|
throw new CustomException($"触发器 Corn 模式下,运行时间表达式必须填写");
|
||||||
}
|
}
|
||||||
if (!CronExpression.IsValidExpression(parm.Cron))
|
if (!string.IsNullOrEmpty(parm.Cron) && !CronExpression.IsValidExpression(parm.Cron))
|
||||||
{
|
{
|
||||||
throw new CustomException($"cron表达式不正确");
|
throw new CustomException($"cron表达式不正确");
|
||||||
}
|
}
|
||||||
@ -150,7 +150,7 @@ namespace ZR.Admin.WebApi.Controllers
|
|||||||
if (response > 0)
|
if (response > 0)
|
||||||
{
|
{
|
||||||
//先暂停原先的任务
|
//先暂停原先的任务
|
||||||
var respon = await _schedulerServer.UpdateTaskScheduleAsync(tasksQz, tasksQz.JobGroup);
|
var respon = await _schedulerServer.UpdateTaskScheduleAsync(tasksQz);
|
||||||
}
|
}
|
||||||
|
|
||||||
return SUCCESS(response);
|
return SUCCESS(response);
|
||||||
@ -264,11 +264,6 @@ namespace ZR.Admin.WebApi.Controllers
|
|||||||
var tasksQz = _tasksQzService.GetFirst(m => m.ID == id);
|
var tasksQz = _tasksQzService.GetFirst(m => m.ID == id);
|
||||||
var taskResult = await _schedulerServer.RunTaskScheduleAsync(tasksQz);
|
var taskResult = await _schedulerServer.RunTaskScheduleAsync(tasksQz);
|
||||||
|
|
||||||
if (taskResult.Code == 200)
|
|
||||||
{
|
|
||||||
//_tasksQzService.Update(tasksQz);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ToResponse(taskResult);
|
return ToResponse(taskResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Builder;
|
|||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Quartz.Spi;
|
using Quartz.Spi;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using ZR.Service.System.IService;
|
using ZR.Service.System.IService;
|
||||||
using ZR.Tasks;
|
using ZR.Tasks;
|
||||||
|
|
||||||
@ -20,7 +21,7 @@ namespace ZR.Admin.WebApi.Extensions
|
|||||||
//添加Quartz服务
|
//添加Quartz服务
|
||||||
services.AddSingleton<IJobFactory, JobFactory>();
|
services.AddSingleton<IJobFactory, JobFactory>();
|
||||||
//添加我们的服务
|
//添加我们的服务
|
||||||
services.AddTransient<Job_SyncTest>();
|
//services.AddTransient<Job_SyncTest>();
|
||||||
|
|
||||||
services.AddTransient<ITaskSchedulerServer, TaskSchedulerServer>();
|
services.AddTransient<ITaskSchedulerServer, TaskSchedulerServer>();
|
||||||
}
|
}
|
||||||
@ -41,7 +42,11 @@ namespace ZR.Admin.WebApi.Extensions
|
|||||||
//程序启动后注册所有定时任务
|
//程序启动后注册所有定时任务
|
||||||
foreach (var task in tasks)
|
foreach (var task in tasks)
|
||||||
{
|
{
|
||||||
_schedulerServer.AddTaskScheduleAsync(task);
|
var result = _schedulerServer.AddTaskScheduleAsync(task);
|
||||||
|
if (result.Result.Code == 200)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"注册任务[{task.Name}]ID:{task.ID}成功");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return app;
|
return app;
|
||||||
|
|||||||
@ -153,5 +153,9 @@ namespace ZR.Model.System
|
|||||||
[SugarColumn(IsOnlyIgnoreInsert = true)]//设置后插入数据不会有此字段
|
[SugarColumn(IsOnlyIgnoreInsert = true)]//设置后插入数据不会有此字段
|
||||||
[JsonProperty(propertyName: "UpdateTime")]
|
[JsonProperty(propertyName: "UpdateTime")]
|
||||||
public DateTime Update_time { get; set; } = DateTime.Now;
|
public DateTime Update_time { get; set; } = DateTime.Now;
|
||||||
|
/// <summary>
|
||||||
|
/// 最后运行时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? LastRunTime { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,6 +23,6 @@ namespace ZR.Tasks
|
|||||||
|
|
||||||
Task<ApiResult> RunTaskScheduleAsync(SysTasksQz tasksQz);
|
Task<ApiResult> RunTaskScheduleAsync(SysTasksQz tasksQz);
|
||||||
|
|
||||||
Task<ApiResult> UpdateTaskScheduleAsync(SysTasksQz tasksQz, string groupName);
|
Task<ApiResult> UpdateTaskScheduleAsync(SysTasksQz tasksQz);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,7 +2,6 @@
|
|||||||
using NLog;
|
using NLog;
|
||||||
using Quartz;
|
using Quartz;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using ZR.Model.System;
|
using ZR.Model.System;
|
||||||
@ -22,7 +21,7 @@ namespace ZR.Tasks
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="context">作业上下文</param>
|
/// <param name="context">作业上下文</param>
|
||||||
/// <param name="job">业务逻辑方法</param>
|
/// <param name="job">业务逻辑方法</param>
|
||||||
public async Task<Dictionary<string,object>> ExecuteJob(IJobExecutionContext context, Func<Task> job)
|
public async Task<SysTasksLog> ExecuteJob(IJobExecutionContext context, Func<Task> job)
|
||||||
{
|
{
|
||||||
double elapsed = 0;
|
double elapsed = 0;
|
||||||
int status = 0;
|
int status = 0;
|
||||||
@ -37,54 +36,54 @@ namespace ZR.Tasks
|
|||||||
await job();
|
await job();
|
||||||
stopwatch.Stop();
|
stopwatch.Stop();
|
||||||
elapsed = stopwatch.Elapsed.TotalMilliseconds;
|
elapsed = stopwatch.Elapsed.TotalMilliseconds;
|
||||||
logMsg = "Succeed";
|
logMsg = "success";
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
JobExecutionException e2 = new JobExecutionException(ex);
|
JobExecutionException e2 = new(ex)
|
||||||
//true 是立即重新执行任务
|
{
|
||||||
e2.RefireImmediately = true;
|
//true 是立即重新执行任务
|
||||||
|
RefireImmediately = true
|
||||||
|
};
|
||||||
status = 1;
|
status = 1;
|
||||||
logMsg = $"Fail,Exception:{ex.Message}";
|
logMsg = $"Fail,Exception:{ex.Message}";
|
||||||
}
|
}
|
||||||
Dictionary<string, object> dic = new Dictionary<string, object>();
|
|
||||||
dic.Add("elapsed", elapsed);
|
|
||||||
dic.Add("status", status);
|
|
||||||
dic.Add("content", logMsg);
|
|
||||||
|
|
||||||
RecordTaskLog(context, dic);
|
var logModel = new SysTasksLog()
|
||||||
return dic;
|
{
|
||||||
|
Elapsed = elapsed,
|
||||||
|
Status = status.ToString(),
|
||||||
|
JobMessage = logMsg
|
||||||
|
};
|
||||||
|
|
||||||
|
RecordTaskLog(context, logModel);
|
||||||
|
return logModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 记录到日志
|
/// 记录到日志
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="context"></param>
|
/// <param name="context"></param>
|
||||||
/// <param name="executeLog"></param>
|
/// <param name="logModel"></param>
|
||||||
protected void RecordTaskLog(IJobExecutionContext context, Dictionary<string, object> executeLog)
|
protected void RecordTaskLog(IJobExecutionContext context, SysTasksLog logModel)
|
||||||
{
|
{
|
||||||
var tasksLogService = (ISysTasksLogService)App.GetRequiredService(typeof(ISysTasksLogService));
|
var tasksLogService = (ISysTasksLogService)App.GetRequiredService(typeof(ISysTasksLogService));
|
||||||
var taskQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService));
|
var taskQzService = (ISysTasksQzService)App.GetRequiredService(typeof(ISysTasksQzService));
|
||||||
|
|
||||||
// 可以直接获取 JobDetail 的值
|
// 可以直接获取 JobDetail 的值
|
||||||
IJobDetail job = context.JobDetail;
|
IJobDetail job = context.JobDetail;
|
||||||
//var param = context.MergedJobDataMap;
|
|
||||||
|
|
||||||
// 也可以通过数据库配置,获取传递过来的参数
|
|
||||||
//JobDataMap data = context.JobDetail.JobDataMap;
|
|
||||||
//int jobId = data.GetInt("JobParam");
|
|
||||||
|
|
||||||
var logModel = new SysTasksLog();
|
|
||||||
|
|
||||||
logModel.InvokeTarget = job.JobType.FullName;
|
logModel.InvokeTarget = job.JobType.FullName;
|
||||||
logModel.Elapsed = (double)executeLog.GetValueOrDefault("elapsed", "0");
|
|
||||||
logModel.JobMessage = executeLog.GetValueOrDefault("content").ToString();
|
|
||||||
logModel.Status = executeLog.GetValueOrDefault("status", "0").ToString();
|
|
||||||
logModel = tasksLogService.AddTaskLog(job.Key.Name, logModel);
|
logModel = tasksLogService.AddTaskLog(job.Key.Name, logModel);
|
||||||
taskQzService.Update(f => f.ID == job.Key.Name, f => new SysTasksQz()
|
//成功后执行次数+1
|
||||||
|
if (logModel.Status == "0")
|
||||||
{
|
{
|
||||||
RunTimes = f.RunTimes + 1
|
taskQzService.Update(f => f.ID == job.Key.Name, f => new SysTasksQz()
|
||||||
});
|
{
|
||||||
|
RunTimes = f.RunTimes + 1,
|
||||||
|
LastRunTime = DateTime.Now
|
||||||
|
});
|
||||||
|
}
|
||||||
logger.Info($"执行任务【{job.Key.Name}|{logModel.JobName}】结果={logModel.JobMessage}");
|
logger.Info($"执行任务【{job.Key.Name}|{logModel.JobName}】结果={logModel.JobMessage}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,11 +1,14 @@
|
|||||||
using Quartz;
|
using Infrastructure.Attribute;
|
||||||
|
using Quartz;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace ZR.Tasks
|
namespace ZR.Tasks.TaskScheduler
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 定时任务测试
|
/// 定时任务测试
|
||||||
|
/// 使用如下注册后TaskExtensions里面不用再注册了
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[AppService(ServiceType = typeof(Job_SyncTest), ServiceLifetime = LifeTime.Scoped)]
|
||||||
public class Job_SyncTest : JobBase, IJob
|
public class Job_SyncTest : JobBase, IJob
|
||||||
{
|
{
|
||||||
//private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
//private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
|
||||||
@ -20,6 +23,7 @@ namespace ZR.Tasks
|
|||||||
await Task.Delay(1);
|
await Task.Delay(1);
|
||||||
//TODO 业务逻辑
|
//TODO 业务逻辑
|
||||||
|
|
||||||
|
System.Console.WriteLine("job test");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,10 +2,13 @@
|
|||||||
using NLog;
|
using NLog;
|
||||||
using Quartz;
|
using Quartz;
|
||||||
using Quartz.Impl;
|
using Quartz.Impl;
|
||||||
|
using Quartz.Impl.Matchers;
|
||||||
using Quartz.Impl.Triggers;
|
using Quartz.Impl.Triggers;
|
||||||
using Quartz.Spi;
|
using Quartz.Spi;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using ZR.Model.System;
|
using ZR.Model.System;
|
||||||
@ -60,7 +63,7 @@ namespace ZR.Tasks
|
|||||||
};
|
};
|
||||||
|
|
||||||
StdSchedulerFactory factory = new StdSchedulerFactory(collection);
|
StdSchedulerFactory factory = new StdSchedulerFactory(collection);
|
||||||
|
|
||||||
return _scheduler = factory.GetScheduler();
|
return _scheduler = factory.GetScheduler();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -153,11 +156,15 @@ namespace ZR.Tasks
|
|||||||
trigger = CreateCronTrigger(tasksQz);
|
trigger = CreateCronTrigger(tasksQz);
|
||||||
//解决Quartz启动后第一次会立即执行问题解决办法
|
//解决Quartz启动后第一次会立即执行问题解决办法
|
||||||
((CronTriggerImpl)trigger).MisfireInstruction = MisfireInstruction.CronTrigger.DoNothing;
|
((CronTriggerImpl)trigger).MisfireInstruction = MisfireInstruction.CronTrigger.DoNothing;
|
||||||
|
|
||||||
// 5、将触发器和任务器绑定到调度器中
|
|
||||||
await _scheduler.Result.ScheduleJob(job, trigger);
|
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
trigger = CreateSimpleTrigger(tasksQz);
|
||||||
|
((SimpleTriggerImpl)trigger).MisfireInstruction = MisfireInstruction.CronTrigger.DoNothing;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5、将触发器和任务器绑定到调度器中
|
||||||
|
await _scheduler.Result.ScheduleJob(job, trigger);
|
||||||
//任务没有启动、暂停任务
|
//任务没有启动、暂停任务
|
||||||
if (!tasksQz.IsStart)
|
if (!tasksQz.IsStart)
|
||||||
{
|
{
|
||||||
@ -252,8 +259,19 @@ namespace ZR.Tasks
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
JobKey jobKey = new JobKey(tasksQz.ID, tasksQz.JobGroup);
|
JobKey jobKey = new JobKey(tasksQz.ID, tasksQz.JobGroup);
|
||||||
|
List<JobKey> jobKeys = _scheduler.Result.GetJobKeys(GroupMatcher<JobKey>.GroupEquals(tasksQz.JobGroup)).Result.ToList();
|
||||||
|
if (jobKeys == null || jobKeys.Count == 0)
|
||||||
|
{
|
||||||
|
return new ApiResult(110, $"未找到分组[{ tasksQz.JobGroup }]");
|
||||||
|
}
|
||||||
|
|
||||||
|
var triggers = await _scheduler.Result.GetTriggersOfJob(jobKey);
|
||||||
|
if (triggers.Count <= 0)
|
||||||
|
{
|
||||||
|
return new ApiResult(110, $"未找到触发器[{jobKey.Name}]");
|
||||||
|
}
|
||||||
await _scheduler.Result.TriggerJob(jobKey);
|
await _scheduler.Result.TriggerJob(jobKey);
|
||||||
|
|
||||||
return ApiResult.Success($"运行计划任务:【{tasksQz.Name}】成功");
|
return ApiResult.Success($"运行计划任务:【{tasksQz.Name}】成功");
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@ -267,11 +285,11 @@ namespace ZR.Tasks
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="tasksQz"></param>
|
/// <param name="tasksQz"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<ApiResult> UpdateTaskScheduleAsync(SysTasksQz tasksQz, string groupName)
|
public async Task<ApiResult> UpdateTaskScheduleAsync(SysTasksQz tasksQz)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
JobKey jobKey = new JobKey(tasksQz.ID, groupName);
|
JobKey jobKey = new JobKey(tasksQz.ID, tasksQz.JobGroup);
|
||||||
if (await _scheduler.Result.CheckExists(jobKey))
|
if (await _scheduler.Result.CheckExists(jobKey))
|
||||||
{
|
{
|
||||||
//防止创建时存在数据问题 先移除,然后在执行创建操作
|
//防止创建时存在数据问题 先移除,然后在执行创建操作
|
||||||
@ -294,33 +312,30 @@ namespace ZR.Tasks
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="tasksQz"></param>
|
/// <param name="tasksQz"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
//private ITrigger CreateSimpleTrigger(SysTasksQz tasksQz)
|
private ITrigger CreateSimpleTrigger(SysTasksQz tasksQz)
|
||||||
//{
|
{
|
||||||
// if (tasksQz.RunTimes > 0)
|
if (tasksQz.RunTimes > 0)
|
||||||
// {
|
{
|
||||||
// ITrigger trigger = TriggerBuilder.Create()
|
ITrigger trigger = TriggerBuilder.Create()
|
||||||
// .WithIdentity(tasksQz.ID, tasksQz.JobGroup)
|
.WithIdentity(tasksQz.ID, tasksQz.JobGroup)
|
||||||
// .StartAt(tasksQz.BeginTime.Value)
|
.StartAt(tasksQz.BeginTime.Value)
|
||||||
// .EndAt(tasksQz.EndTime.Value)
|
.EndAt(tasksQz.EndTime.Value)
|
||||||
// .WithSimpleSchedule(x =>
|
.WithSimpleSchedule(x => x.WithIntervalInSeconds(tasksQz.IntervalSecond)
|
||||||
// x.WithIntervalInSeconds(tasksQz.IntervalSecond)
|
.WithRepeatCount(tasksQz.RunTimes)).ForJob(tasksQz.ID, tasksQz.JobGroup).Build();
|
||||||
// .WithRepeatCount(tasksQz.RunTimes)).ForJob(tasksQz.ID, tasksQz.JobGroup).Build();
|
return trigger;
|
||||||
// return trigger;
|
}
|
||||||
// }
|
else
|
||||||
// else
|
{
|
||||||
// {
|
ITrigger trigger = TriggerBuilder.Create()
|
||||||
// ITrigger trigger = TriggerBuilder.Create()
|
.WithIdentity(tasksQz.ID, tasksQz.JobGroup)
|
||||||
// .WithIdentity(tasksQz.ID, tasksQz.JobGroup)
|
.StartAt(tasksQz.BeginTime.Value)
|
||||||
// .StartAt(tasksQz.BeginTime.Value)
|
.EndAt(tasksQz.EndTime.Value)
|
||||||
// .EndAt(tasksQz.EndTime.Value)
|
.WithSimpleSchedule(x => x.WithIntervalInSeconds(tasksQz.IntervalSecond)
|
||||||
// .WithSimpleSchedule(x =>
|
.RepeatForever()).ForJob(tasksQz.ID, tasksQz.JobGroup).Build();
|
||||||
// x.WithIntervalInSeconds(tasksQz.IntervalSecond)
|
return trigger;
|
||||||
// .RepeatForever()).ForJob(tasksQz.ID, tasksQz.JobGroup).Build();
|
}
|
||||||
// return trigger;
|
// 触发作业立即运行,然后每10秒重复一次,无限循环
|
||||||
// }
|
}
|
||||||
// // 触发作业立即运行,然后每10秒重复一次,无限循环
|
|
||||||
|
|
||||||
//}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 创建类型Cron的触发器
|
/// 创建类型Cron的触发器
|
||||||
|
|||||||
@ -34,23 +34,23 @@
|
|||||||
<right-toolbar :showSearch.sync="searchToggle" @queryTable="handleQuery"></right-toolbar>
|
<right-toolbar :showSearch.sync="searchToggle" @queryTable="handleQuery"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-table ref="tasks" v-loading="loading" :data="dataTasks" border="" row-key="id" :height="tableHeight*0.65" @sort-change="handleSortable"
|
<el-table ref="tasks" v-loading="loading" :data="dataTasks" border="" row-key="id" @sort-change="handleSortable">
|
||||||
@selection-change="handleSelectionChange">
|
|
||||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
|
||||||
<el-table-column type="index" :index="handleIndexCalc" label="#" align="center" />
|
<el-table-column type="index" :index="handleIndexCalc" label="#" align="center" />
|
||||||
<el-table-column prop="name" :show-overflow-tooltip="true" label="任务名称" />
|
<el-table-column prop="name" :show-overflow-tooltip="true" label="任务名称" width="80" />
|
||||||
<el-table-column prop="jobGroup" :show-overflow-tooltip="true" align="center" label="任务分组" />
|
<el-table-column prop="jobGroup" :show-overflow-tooltip="true" align="center" label="任务分组" width="80" />
|
||||||
<el-table-column prop="assemblyName" align="center" label="程序集名称" :show-overflow-tooltip="true" />
|
<el-table-column prop="assemblyName" align="center" label="程序集名称" :show-overflow-tooltip="true" />
|
||||||
<el-table-column prop="className" align="center" label="任务类名" :show-overflow-tooltip="true" />
|
<el-table-column prop="className" align="center" label="任务类名" :show-overflow-tooltip="true" />
|
||||||
<el-table-column prop="runTimes" align="center" label="运行次数"/>
|
<el-table-column prop="runTimes" align="center" label="运行次数" width="80" />
|
||||||
<el-table-column prop="cron" align="center" label="运行表达式" />
|
<el-table-column prop="intervalSecond" align="center" label="执行间隔(s)" width="90" />
|
||||||
|
<el-table-column prop="cron" align="center" label="运行表达式" :show-overflow-tooltip="true" />
|
||||||
<el-table-column sortable prop="isStart" align="center" label="任务状态" width="100">
|
<el-table-column sortable prop="isStart" align="center" label="任务状态" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag size="mini" :type="scope.row.isStart ? 'success' : 'danger'" disable-transitions>{{ scope.row.isStart ? "运行中":"已停止" }}</el-tag>
|
<el-tag size="mini" :type="scope.row.isStart ? 'success' : 'danger'">{{ scope.row.isStart ? "运行中":"已停止" }}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="remark" align="center" label="备注" :show-overflow-tooltip="true"/>
|
<el-table-column prop="lastRunTime" align="center" label="最后运行时间" :show-overflow-tooltip="true" />
|
||||||
<el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width">
|
<el-table-column prop="remark" align="center" label="备注" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" size="mini" icon="el-icon-view" v-hasPermi="['monitor:job:query']">
|
<el-button type="text" size="mini" icon="el-icon-view" v-hasPermi="['monitor:job:query']">
|
||||||
<router-link :to="{path: 'job/log', query: {jobId: scope.row.id}}">日志</router-link>
|
<router-link :to="{path: 'job/log', query: {jobId: scope.row.id}}">日志</router-link>
|
||||||
@ -72,7 +72,7 @@
|
|||||||
<pagination :total="total" :page.sync="queryParams.PageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
|
<pagination :total="total" :page.sync="queryParams.PageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body @close="cancel">
|
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24" v-if="this.form.id">
|
<el-col :span="24" v-if="this.form.id">
|
||||||
@ -114,19 +114,16 @@
|
|||||||
<el-input v-model="form.jobParams" placeholder="传入参数" />
|
<el-input v-model="form.jobParams" placeholder="传入参数" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="16" v-show="form.triggerType == 1">
|
<el-col :span="24" v-show="form.triggerType == 1">
|
||||||
<el-form-item label="间隔(Cron)" prop="cron">
|
<el-form-item label="间隔(Cron)" prop="cron">
|
||||||
<el-input v-model="form.cron" placeholder="如10分钟执行一次:0/0 0/10 * * * ?" />
|
<el-input placeholder="如10分钟执行一次:0/0 0/10 * * * ?" v-model="form.cron">
|
||||||
</el-form-item>
|
<el-link slot="append" href="https://qqe2.com/cron" type="primary" target="_blank" class="mr10">cron在线生成</el-link>
|
||||||
</el-col>
|
</el-input>
|
||||||
<el-col :span="8" v-show="form.triggerType == 1">
|
|
||||||
<el-form-item label-width="20px">
|
|
||||||
<el-link href="https://cron.qqe2.com/" type="primary" target="_blank" class="mr10">cyon在线生成</el-link>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="开始日期" prop="beginTime">
|
<el-form-item label="开始日期" prop="beginTime">
|
||||||
<el-date-picker v-model="form.beginTime" style="width:100%" type="date" placeholder="选择开始日期" />
|
<el-date-picker v-model="form.beginTime" style="width:100%" type="date" :picker-options="pickerOptions" placeholder="选择开始日期" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
@ -139,16 +136,16 @@
|
|||||||
<el-input-number v-model="form.intervalSecond" :max="9999999999" step-strictly controls-position="right" :min="1" />
|
<el-input-number v-model="form.intervalSecond" :max="9999999999" step-strictly controls-position="right" :min="1" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
<el-input type="textarea" v-model="form.remark"/>
|
<el-input type="textarea" v-model="form.remark" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="text" @click="cancel">取 消</el-button>
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
@ -163,55 +160,55 @@ import {
|
|||||||
startTasks,
|
startTasks,
|
||||||
stopTasks,
|
stopTasks,
|
||||||
runTasks,
|
runTasks,
|
||||||
exportTasks,
|
exportTasks
|
||||||
} from "@/api/monitor/job";
|
} from '@/api/monitor/job'
|
||||||
export default {
|
export default {
|
||||||
name: "job",
|
name: 'job',
|
||||||
data() {
|
data() {
|
||||||
var cronValidate = (rule, value, callback) => {
|
var cronValidate = (rule, value, callback) => {
|
||||||
if (this.form.triggerType === 1) {
|
if (this.form.triggerType === 1) {
|
||||||
if (value === "" || value === undefined) {
|
if (value === '' || value === undefined) {
|
||||||
callback(new Error("运行时间表达式不能为空!"));
|
callback(new Error('运行时间表达式不能为空!'))
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
var beginTimeValidate = (rule, value, callback) => {
|
var beginTimeValidate = (rule, value, callback) => {
|
||||||
if (this.form.triggerType === 0) {
|
if (this.form.triggerType === 0) {
|
||||||
if (value === "" || value === undefined) {
|
if (value === '' || value === undefined) {
|
||||||
callback(new Error("选择开始日期!"));
|
callback(new Error('选择开始日期!'))
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
var endTimeValidate = (rule, value, callback) => {
|
var endTimeValidate = (rule, value, callback) => {
|
||||||
if (this.form.triggerType === 0) {
|
if (this.form.triggerType === 0) {
|
||||||
if (value === "" || value === undefined) {
|
if (value === '' || value === undefined) {
|
||||||
callback(new Error("选择结束日期!"));
|
callback(new Error('选择结束日期!'))
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
var intervalSecondValidate = (rule, value, callback) => {
|
var intervalSecondValidate = (rule, value, callback) => {
|
||||||
if (this.form.triggerType === 0) {
|
if (this.form.triggerType === 0) {
|
||||||
if (value === "" || value === undefined) {
|
if (value === '' || value === undefined) {
|
||||||
callback(new Error("请设置执行间隔!"));
|
callback(new Error('请设置执行间隔!'))
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback()
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
return {
|
return {
|
||||||
// 选中数组
|
// 选中数组
|
||||||
ids: [],
|
ids: [],
|
||||||
@ -224,7 +221,7 @@ export default {
|
|||||||
// 表单
|
// 表单
|
||||||
form: {},
|
form: {},
|
||||||
// 表单标题
|
// 表单标题
|
||||||
title: "",
|
title: '',
|
||||||
// 显示搜索
|
// 显示搜索
|
||||||
searchToggle: true,
|
searchToggle: true,
|
||||||
// 表格高度
|
// 表格高度
|
||||||
@ -238,107 +235,118 @@ export default {
|
|||||||
queryText: undefined,
|
queryText: undefined,
|
||||||
PageNum: 1,
|
PageNum: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
orderby: "createTime",
|
orderby: 'createTime',
|
||||||
sort: "descending",
|
sort: 'descending'
|
||||||
},
|
},
|
||||||
// 计划任务列表
|
// 计划任务列表
|
||||||
dataTasks: [],
|
dataTasks: [],
|
||||||
// 任务状态字典
|
// 任务状态字典
|
||||||
isStartOptions: [
|
isStartOptions: [
|
||||||
{ dictLabel: "运行中", dictValue: "true" },
|
{ dictLabel: '运行中', dictValue: 'true' },
|
||||||
{ dictLabel: "已停止", dictValue: "false", listClass: "danger" },
|
{ dictLabel: '已停止', dictValue: 'false', listClass: 'danger' }
|
||||||
],
|
],
|
||||||
//任务组名字典
|
// 任务组名字典
|
||||||
jobGroupOptions: [],
|
jobGroupOptions: [],
|
||||||
// 触发器类型
|
// 触发器类型
|
||||||
triggerTypeOptions: [
|
triggerTypeOptions: [
|
||||||
{
|
{
|
||||||
label: "Simple / [普通]",
|
label: '[普通]',
|
||||||
value: 0,
|
value: 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: "Cron / [表达式]",
|
label: '[表达式]',
|
||||||
value: 1,
|
value: 1
|
||||||
},
|
}
|
||||||
],
|
],
|
||||||
// 表单校验
|
// 表单校验
|
||||||
rules: {
|
rules: {
|
||||||
name: [
|
name: [
|
||||||
{ required: true, message: "任务名称不能为空", trigger: "blur" },
|
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
jobGroup: [
|
jobGroup: [
|
||||||
{ required: true, message: "任务分组不能为空", trigger: "blur" },
|
{ required: true, message: '任务分组不能为空', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
assemblyName: [
|
assemblyName: [
|
||||||
{ required: true, message: "程序集名称不能为空", trigger: "blur" },
|
{ required: true, message: '程序集名称不能为空', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
className: [
|
className: [
|
||||||
{ required: true, message: "任务类名不能为空", trigger: "blur" },
|
{ required: true, message: '任务类名不能为空', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
triggerType: [
|
triggerType: [
|
||||||
{ required: true, message: "请选择触发器类型", trigger: "blur" },
|
{ required: true, message: '请选择触发器类型', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
cron: [{ validator: cronValidate, trigger: "blur" }],
|
cron: [{ validator: cronValidate, trigger: 'blur' }],
|
||||||
beginTime: [{ validator: beginTimeValidate, trigger: "blur" }],
|
beginTime: [{ validator: beginTimeValidate, trigger: 'blur' }],
|
||||||
endTime: [{ validator: endTimeValidate, trigger: "blur" }],
|
endTime: [{ validator: endTimeValidate, trigger: 'blur' }],
|
||||||
intervalSecond: [
|
intervalSecond: [
|
||||||
{
|
{
|
||||||
validator: intervalSecondValidate,
|
validator: intervalSecondValidate,
|
||||||
type: "number",
|
type: 'number',
|
||||||
trigger: "blur",
|
trigger: 'blur'
|
||||||
},
|
}
|
||||||
],
|
]
|
||||||
},
|
},
|
||||||
};
|
// 时间的选择
|
||||||
|
pickerOptions: {
|
||||||
|
disabledDate(time) {
|
||||||
|
return time.getTime() < Date.now() - 8.64e7;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getList();
|
this.getList()
|
||||||
this.getDicts("sys_job_group").then((response) => {
|
this.getDicts('sys_job_group').then((response) => {
|
||||||
this.jobGroupOptions = response.data;
|
this.jobGroupOptions = response.data
|
||||||
});
|
})
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
'form.triggerType': {
|
||||||
|
handler(val) {
|
||||||
|
console.log(val)
|
||||||
|
if (val == 0) {
|
||||||
|
this.form.cron = undefined
|
||||||
|
}
|
||||||
|
},
|
||||||
|
deep: true,
|
||||||
|
immediate: true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询计划任务列表 */
|
/** 查询计划任务列表 */
|
||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true
|
||||||
queryTasks(this.queryParams).then((response) => {
|
queryTasks(this.queryParams).then((response) => {
|
||||||
this.dataTasks = response.data.result;
|
this.dataTasks = response.data.result
|
||||||
this.total = response.data.totalNum;
|
this.total = response.data.totalNum
|
||||||
this.loading = false;
|
this.loading = false
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
handleQuery() {
|
handleQuery() {
|
||||||
this.getList();
|
this.getList()
|
||||||
},
|
},
|
||||||
/** 重置按钮操作 */
|
/** 重置按钮操作 */
|
||||||
handleReset() {
|
handleReset() {
|
||||||
this.queryParams.queryText = "";
|
this.queryParams.queryText = ''
|
||||||
this.getList();
|
this.getList()
|
||||||
},
|
},
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
handleCreate() {
|
handleCreate() {
|
||||||
this.reset();
|
this.reset()
|
||||||
this.open = true;
|
this.open = true
|
||||||
this.title = "添加计划任务";
|
this.title = '添加计划任务'
|
||||||
},
|
},
|
||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
handleUpdate(row) {
|
handleUpdate(row) {
|
||||||
this.reset();
|
this.reset()
|
||||||
|
|
||||||
this.form = row;
|
this.form = row
|
||||||
this.open = true;
|
this.open = true
|
||||||
this.title = "修改计划任务";
|
this.title = '修改计划任务'
|
||||||
},
|
},
|
||||||
/** 任务日志列表查询 */
|
/** 任务日志列表查询 */
|
||||||
handleJobLog(param) {
|
handleJobLog(param) {
|
||||||
this.$router.push({ path: "job/log", params: param });
|
this.$router.push({ path: 'job/log', params: param })
|
||||||
},
|
|
||||||
// 多选框选中数据
|
|
||||||
handleSelectionChange(selection) {
|
|
||||||
console.log(selection);
|
|
||||||
this.ids = selection; // selection.map(item => item.id);
|
|
||||||
this.single = selection.length != 1;
|
|
||||||
this.multiple = !selection.length;
|
|
||||||
},
|
},
|
||||||
// 启动按钮
|
// 启动按钮
|
||||||
handleStart(row) {
|
handleStart(row) {
|
||||||
@ -346,12 +354,12 @@ export default {
|
|||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: response.msg,
|
message: response.msg,
|
||||||
type: "success",
|
type: 'success'
|
||||||
});
|
})
|
||||||
this.open = false;
|
this.open = false
|
||||||
this.getList();
|
this.getList()
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
// 停止按钮
|
// 停止按钮
|
||||||
handleStop(row) {
|
handleStop(row) {
|
||||||
@ -359,93 +367,94 @@ export default {
|
|||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: response.msg,
|
message: response.msg,
|
||||||
type: "success",
|
type: 'success'
|
||||||
});
|
})
|
||||||
this.open = false;
|
this.open = false
|
||||||
this.getList();
|
this.getList()
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
const jobInfo = row;
|
const jobInfo = row
|
||||||
|
|
||||||
this.$confirm(
|
this.$confirm(
|
||||||
'是否确认删除名称为"' + jobInfo.name + '"的计划任务?',
|
'是否确认删除名称为"' + jobInfo.name + '"的计划任务?',
|
||||||
"警告",
|
'警告',
|
||||||
{
|
{
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: "取消",
|
cancelButtonText: '取消',
|
||||||
type: "warning",
|
type: 'warning'
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
deleteTasks(jobInfo.id).then((response) => {
|
deleteTasks(jobInfo.id).then((response) => {
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.getList();
|
this.getList()
|
||||||
this.$message({
|
this.$message({
|
||||||
message: "删除成功",
|
message: '删除成功',
|
||||||
type: "success",
|
type: 'success'
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
})
|
})
|
||||||
.catch(function () {});
|
.catch(function() {})
|
||||||
},
|
},
|
||||||
/* 立即执行一次 */
|
/* 立即执行一次 */
|
||||||
handleRun(row) {
|
handleRun(row) {
|
||||||
const jobInfo = row;
|
const jobInfo = row
|
||||||
|
|
||||||
this.$confirm('确认要立即执行一次"' + jobInfo.name + '"任务吗?', "警告", {
|
this.$confirm('确认要立即执行一次"' + jobInfo.name + '"任务吗?', '警告', {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: "取消",
|
cancelButtonText: '取消',
|
||||||
type: "warning",
|
type: 'warning'
|
||||||
}).then((res) => {
|
}).then((res) => {
|
||||||
runTasks(jobInfo.id).then((res) => {
|
runTasks(jobInfo.id).then((res) => {
|
||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: "执行成功",
|
message: '执行成功',
|
||||||
type: "success",
|
type: 'success'
|
||||||
});
|
})
|
||||||
|
this.getList()
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm: function () {
|
submitForm: function() {
|
||||||
this.$refs["form"].validate((valid) => {
|
this.$refs['form'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if (this.form.id !== undefined) {
|
if (this.form.id !== undefined) {
|
||||||
updateTasks(this.form).then((response) => {
|
updateTasks(this.form).then((response) => {
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: "修改成功",
|
message: '修改成功',
|
||||||
type: "success",
|
type: 'success'
|
||||||
});
|
})
|
||||||
this.open = false;
|
this.open = false
|
||||||
this.getList();
|
this.getList()
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
} else {
|
} else {
|
||||||
createTasks(this.form).then((response) => {
|
createTasks(this.form).then((response) => {
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: "新增成功",
|
message: '新增成功',
|
||||||
type: "success",
|
type: 'success'
|
||||||
});
|
})
|
||||||
this.open = false;
|
this.open = false
|
||||||
this.getList();
|
this.getList()
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
},
|
},
|
||||||
// 排序操作
|
// 排序操作
|
||||||
handleSortable(val) {
|
handleSortable(val) {
|
||||||
this.queryParams.orderby = val.prop;
|
this.queryParams.orderby = val.prop
|
||||||
this.queryParams.sort = val.order;
|
this.queryParams.sort = val.order
|
||||||
this.getList();
|
this.getList()
|
||||||
},
|
},
|
||||||
// 表单重置
|
// 表单重置
|
||||||
reset() {
|
reset() {
|
||||||
@ -453,41 +462,42 @@ export default {
|
|||||||
id: undefined,
|
id: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
jobGroup: undefined,
|
jobGroup: undefined,
|
||||||
assemblyName: undefined,
|
assemblyName: 'ZR.Tasks',
|
||||||
className: undefined,
|
className: undefined,
|
||||||
jobParams: undefined,
|
jobParams: undefined,
|
||||||
triggerType: 1,
|
triggerType: 1,
|
||||||
beginTime: undefined,
|
beginTime: undefined,
|
||||||
endTime: undefined,
|
endTime: undefined,
|
||||||
intervalSecond: 1,
|
intervalSecond: 1,
|
||||||
};
|
cron: undefined
|
||||||
|
}
|
||||||
|
this.resetForm('form')
|
||||||
},
|
},
|
||||||
// 自动计算分页 Id
|
// 自动计算分页 Id
|
||||||
handleIndexCalc(index) {
|
handleIndexCalc(index) {
|
||||||
return (
|
return (
|
||||||
(this.queryParams.PageNum - 1) * this.queryParams.pageSize + index + 1
|
(this.queryParams.PageNum - 1) * this.queryParams.pageSize + index + 1
|
||||||
);
|
)
|
||||||
},
|
},
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
this.open = false;
|
this.open = false
|
||||||
this.reset();
|
this.reset()
|
||||||
this.getList();
|
|
||||||
},
|
},
|
||||||
/** 导出按钮操作 */
|
/** 导出按钮操作 */
|
||||||
handleExport() {
|
handleExport() {
|
||||||
this.$confirm("是否确认导出所有任务?", "警告", {
|
this.$confirm('是否确认导出所有任务?', '警告', {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: '确定',
|
||||||
cancelButtonText: "取消",
|
cancelButtonText: '取消',
|
||||||
type: "warning",
|
type: 'warning'
|
||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
return exportTasks();
|
return exportTasks()
|
||||||
})
|
})
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
this.download(response.data.path);
|
this.download(response.data.path)
|
||||||
});
|
})
|
||||||
},
|
}
|
||||||
},
|
}
|
||||||
};
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -46,7 +46,7 @@
|
|||||||
<el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
|
<el-table-column label="执行状态" align="center" prop="status" :formatter="statusFormat" />
|
||||||
<el-table-column label="作业用时" align="center" prop="elapsed">
|
<el-table-column label="作业用时" align="center" prop="elapsed">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span :style="scope.row.elapsed < 1000 ? 'color:green':scope.row.elapsed <3000 ?'color:orange':'color:red'">{{ scope.row.elapsed }} ms</span>
|
<span :style="scope.row.elapsed < 1000 ? 'color:green':scope.row.elapsed <3000 ?'color:orange':'color:red'">{{ scope.row.elapsed /1000 }} ms</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="执行时间" align="center" prop="createTime" width="180">
|
<el-table-column label="执行时间" align="center" prop="createTime" width="180">
|
||||||
@ -87,13 +87,13 @@
|
|||||||
<div v-else-if="form.status == 1">失败</div>
|
<div v-else-if="form.status == 1">失败</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24" v-if="form.status == 1">>
|
||||||
<el-form-item label="异常信息:" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
|
<el-form-item label="异常信息:">{{ form.exception }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button @click="open = false">关 闭</el-button>
|
<el-button type="text" @click="open = false">关 闭</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -5,33 +5,34 @@ SET FOREIGN_KEY_CHECKS = 0;
|
|||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for Sys_TasksQz
|
-- Table structure for Sys_TasksQz
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
DROP TABLE IF EXISTS `Sys_TasksQz`;
|
DROP TABLE IF EXISTS `sys_tasksQz`;
|
||||||
CREATE TABLE `Sys_TasksQz` (
|
CREATE TABLE `Sys_TasksQz` (
|
||||||
`ID` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'UID',
|
`id` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'UID',
|
||||||
`Name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务名称',
|
`name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务名称',
|
||||||
`JobGroup` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务分组',
|
`jobGroup` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务分组',
|
||||||
`Cron` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '运行时间表达式',
|
`cron` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '运行时间表达式',
|
||||||
`AssemblyName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '程序集名称',
|
`assemblyName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '程序集名称',
|
||||||
`ClassName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务所在类',
|
`className` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务所在类',
|
||||||
`Remark` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '任务描述',
|
`remark` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '任务描述',
|
||||||
`RunTimes` int(11) NOT NULL COMMENT '执行次数',
|
`runTimes` int(11) NOT NULL COMMENT '执行次数',
|
||||||
`BeginTime` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
|
`beginTime` datetime(0) NULL DEFAULT NULL COMMENT '开始时间',
|
||||||
`EndTime` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
|
`endTime` datetime(0) NULL DEFAULT NULL COMMENT '结束时间',
|
||||||
`TriggerType` int(11) NOT NULL COMMENT '触发器类型(0、simple 1、cron)',
|
`triggerType` int(11) NOT NULL COMMENT '触发器类型(0、simple 1、cron)',
|
||||||
`IntervalSecond` int(11) NOT NULL COMMENT '执行间隔时间(单位:秒)',
|
`intervalSecond` int(11) NOT NULL COMMENT '执行间隔时间(单位:秒)',
|
||||||
`IsStart` tinyint(4) NOT NULL COMMENT '是否启动',
|
`isStart` tinyint(4) NOT NULL COMMENT '是否启动',
|
||||||
`JobParams` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '传入参数',
|
`jobParams` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '传入参数',
|
||||||
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
|
`create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
|
||||||
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '最后更新时间',
|
`update_time` datetime(0) NULL DEFAULT NULL COMMENT '最后更新时间',
|
||||||
`create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人编码',
|
`create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人编码',
|
||||||
`update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人编码',
|
`update_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人编码',
|
||||||
|
`lastRunTime` datetime(0) NULL DEFAULT NULL COMMENT '最后执行时间',
|
||||||
PRIMARY KEY (`ID`) USING BTREE
|
PRIMARY KEY (`ID`) USING BTREE
|
||||||
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '计划任务' ROW_FORMAT = Dynamic;
|
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '计划任务' ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Records of Sys_TasksQz
|
-- Records of Sys_TasksQz
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
INSERT INTO `Sys_TasksQz` VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL);
|
INSERT INTO `sys_tasksQz` VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL);
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- Table structure for sys_Tasks_log
|
-- Table structure for sys_Tasks_log
|
||||||
@ -51,13 +52,6 @@ CREATE TABLE `sys_Tasks_log` (
|
|||||||
PRIMARY KEY (`jobLogId`) USING BTREE
|
PRIMARY KEY (`jobLogId`) USING BTREE
|
||||||
) ENGINE = InnoDB AUTO_INCREMENT = 198 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
|
) ENGINE = InnoDB AUTO_INCREMENT = 198 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '定时任务调度日志表' ROW_FORMAT = Dynamic;
|
||||||
|
|
||||||
-- ----------------------------
|
|
||||||
-- Records of sys_Tasks_log
|
|
||||||
-- ----------------------------
|
|
||||||
INSERT INTO `sys_Tasks_log` VALUES (196, '1410905433996136448', '测试任务', 'SYSTEM', 'Succeed', '0', NULL, SYSDATE(), 'ZRTasks.Job_SyncTest', 18);
|
|
||||||
INSERT INTO `sys_Tasks_log` VALUES (197, '1410905433996136448', '测试任务', 'SYSTEM', 'Succeed', '0', NULL, SYSDATE(), 'ZRTasks.Job_SyncTest', 14);
|
|
||||||
|
|
||||||
|
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
-- 通知公告表
|
-- 通知公告表
|
||||||
-- ----------------------------
|
-- ----------------------------
|
||||||
|
|||||||
@ -2,36 +2,37 @@
|
|||||||
GO
|
GO
|
||||||
USE ZrAdmin
|
USE ZrAdmin
|
||||||
GO
|
GO
|
||||||
if OBJECT_ID(N'Sys_tasksQz',N'U') is not NULL DROP TABLE Sys_tasksQz
|
if OBJECT_ID(N'sys_tasksQz',N'U') is not NULL DROP TABLE sys_tasksQz
|
||||||
GO
|
GO
|
||||||
CREATE TABLE Sys_tasksQz
|
CREATE TABLE sys_tasksQz
|
||||||
(
|
(
|
||||||
ID VARCHAR(100) NOT NULL PRIMARY KEY, --任务ID
|
id VARCHAR(100) NOT NULL PRIMARY KEY, --任务ID
|
||||||
Name VARCHAR(50) NOT NULL, --任务名
|
name VARCHAR(50) NOT NULL, --任务名
|
||||||
JobGroup varchar(255) NOT NULL, --'任务分组',
|
jobGroup varchar(255) NOT NULL, --'任务分组',
|
||||||
Cron varchar(255) NOT NULL , --'运行时间表达式',
|
cron varchar(255) NOT NULL , --'运行时间表达式',
|
||||||
AssemblyName varchar(255) NOT NULL , --'程序集名称',
|
assemblyName varchar(255) NOT NULL , --'程序集名称',
|
||||||
ClassName varchar(255) NOT NULL , --'任务所在类',
|
className varchar(255) NOT NULL , --'任务所在类',
|
||||||
Remark VARCHAR(200) NULL , --'任务描述',
|
remark VARCHAR(200) NULL , --'任务描述',
|
||||||
RunTimes int NOT NULL , --'执行次数',
|
runTimes int NOT NULL , --'执行次数',
|
||||||
BeginTime datetime NULL DEFAULT NULL , --'开始时间',
|
beginTime datetime NULL DEFAULT NULL , --'开始时间',
|
||||||
EndTime datetime NULL DEFAULT NULL , --'结束时间',
|
endTime datetime NULL DEFAULT NULL , --'结束时间',
|
||||||
TriggerType int NOT NULL , --'触发器类型(0、simple 1、cron)',
|
triggerType int NOT NULL , --'触发器类型(0、simple 1、cron)',
|
||||||
IntervalSecond int NOT NULL , --'执行间隔时间(单位:秒)',
|
intervalSecond int NOT NULL , --'执行间隔时间(单位:秒)',
|
||||||
IsStart int NOT NULL , --'是否启动',
|
isStart int NOT NULL , --'是否启动',
|
||||||
JobParams TEXT NULL , --'传入参数',
|
jobParams TEXT NULL , --'传入参数',
|
||||||
create_time datetime NULL DEFAULT NULL , --'创建时间',
|
create_time datetime NULL DEFAULT NULL , --'创建时间',
|
||||||
update_time datetime NULL DEFAULT NULL , --'最后更新时间',
|
update_time datetime NULL DEFAULT NULL , --'最后更新时间',
|
||||||
create_by varchar(50) NULL DEFAULT NULL , --'创建人编码',
|
create_by varchar(50) NULL DEFAULT NULL , --'创建人编码',
|
||||||
update_by varchar(50) NULL DEFAULT NULL , --'更新人编码',
|
update_by varchar(50) NULL DEFAULT NULL , --'更新人编码',
|
||||||
|
lastRunTime datetime , --最后执行时间
|
||||||
)
|
)
|
||||||
GO
|
GO
|
||||||
INSERT INTO Sys_TasksQz VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL);
|
INSERT INTO sys_tasksQz VALUES ('1410905433996136448', '测试任务', 'SYSTEM', '0 0/10 * * * ? ', 'ZR.Tasks', 'TaskScheduler.Job_SyncTest', NULL, 0, '2021-07-02 18:17:31', '9999-12-31 00:00:00', 1, 1, 1, NULL, '2021-07-02 18:17:23', '2021-07-02 18:17:31', 'admin', NULL, NULL);
|
||||||
GO
|
GO
|
||||||
if OBJECT_ID(N'sys_Tasks_log',N'U') is not NULL DROP TABLE sys_Tasks_log
|
if OBJECT_ID(N'sys_Tasks_log',N'U') is not NULL DROP TABLE sys_Tasks_log
|
||||||
GO
|
GO
|
||||||
/**定时任务调度日志表*/
|
/**定时任务调度日志表*/
|
||||||
CREATE TABLE sys_Tasks_log (
|
CREATE TABLE sys_tasks_log (
|
||||||
jobLogId bigint NOT NULL PRIMARY KEY IDENTITY(1,1), -- '任务日志ID',
|
jobLogId bigint NOT NULL PRIMARY KEY IDENTITY(1,1), -- '任务日志ID',
|
||||||
jobId varchar(20) NOT NULL , -- '任务id',
|
jobId varchar(20) NOT NULL , -- '任务id',
|
||||||
jobName varchar(64) NOT NULL , -- '任务名称',
|
jobName varchar(64) NOT NULL , -- '任务名称',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user