diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index 66fcc42..d209168 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -253,11 +253,12 @@ namespace ZR.Admin.WebApi.Controllers [Log(Title = "执行任务", BusinessType = BusinessType.OTHER)] public async Task Run(string id) { - if (!_tasksQzService.Any(m => m.ID == id)) + var result = await _tasksQzService.IsAnyAsync(m => m.ID == id); + if (!result) { throw new CustomException("任务不存在"); } - var tasksQz = _tasksQzService.GetFirst(m => m.ID == id); + var tasksQz = await _tasksQzService.GetFirstAsync(m => m.ID == id); var taskResult = await _schedulerServer.RunTaskScheduleAsync(tasksQz); return ToResponse(taskResult); diff --git a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs index e878a63..e96b7ca 100644 --- a/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs +++ b/ZR.Tasks/TaskScheduler/Job_HttpRequest.cs @@ -3,8 +3,10 @@ using Infrastructure.Attribute; using Quartz; using Quartz.Impl; using Quartz.Impl.Triggers; +using SqlSugar.IOC; using System; using System.Threading.Tasks; +using ZR.Model.System; using ZR.Service.System.IService; namespace ZR.Tasks.TaskScheduler @@ -15,13 +17,13 @@ namespace ZR.Tasks.TaskScheduler [AppService(ServiceType = typeof(Job_HttpRequest), ServiceLifetime = LifeTime.Scoped)] internal class Job_HttpRequest : JobBase, IJob { - private readonly ISysTasksQzService tasksQzService; + //private readonly ISysTasksQzService tasksQzService; private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger(); - public Job_HttpRequest(ISysTasksQzService tasksQzService) - { - this.tasksQzService = tasksQzService; - } + //public Job_HttpRequest(ISysTasksQzService tasksQzService) + //{ + // this.tasksQzService = tasksQzService; + //} public async Task Execute(IJobExecutionContext context) { await ExecuteJob(context, async () => await Run(context)); @@ -29,7 +31,8 @@ namespace ZR.Tasks.TaskScheduler public async Task Run(IJobExecutionContext context) { AbstractTrigger trigger = (context as JobExecutionContextImpl).Trigger as AbstractTrigger; - var info = await tasksQzService.GetByIdAsync(trigger.JobName); + //var info = await tasksQzService.CopyNew().GetByIdAsync(trigger.JobName); + var info = await DbScoped.SugarScope.CopyNew().Queryable().FirstAsync(f => f.ID == trigger.JobName); if (info == null) { throw new CustomException($"任务{trigger?.JobName}网络请求执行失败,任务不存在");