From 494ccdbb886ac178d653517ef8ef4accee039b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 25 Mar 2022 13:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=85=B3=E9=97=AD=E5=90=8E=E5=86=8D=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E8=A2=AB=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Tasks/TaskSchedulerServer.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ZR.Tasks/TaskSchedulerServer.cs b/ZR.Tasks/TaskSchedulerServer.cs
index 681c405a..0130aad1 100644
--- a/ZR.Tasks/TaskSchedulerServer.cs
+++ b/ZR.Tasks/TaskSchedulerServer.cs
@@ -123,6 +123,10 @@ namespace ZR.Tasks
                 {
                     return ApiResult.Error(500, $"该计划任务已经在执行:【{tasksQz.Name}】,请勿重复添加！");
                 }
+                if (tasksQz?.EndTime <= DateTime.Now)
+                {
+                    return ApiResult.Error(500, $"结束时间小于当前时间计划将不会被执行");
+                }
                 #region 设置开始时间和结束时间
 
                 tasksQz.BeginTime = tasksQz.BeginTime == null ? DateTime.Now : tasksQz.BeginTime;
@@ -166,10 +170,12 @@ namespace ZR.Tasks
                 // 5、将触发器和任务器绑定到调度器中
                 await _scheduler.Result.ScheduleJob(job, trigger);
                 //任务没有启动、暂停任务
-                if (!tasksQz.IsStart)
-                {
-                    _scheduler.Result.PauseJob(jobKey).Wait();
-                }
+                //if (!tasksQz.IsStart)
+                //{
+                //    _scheduler.Result.PauseJob(jobKey).Wait();
+                //}
+                //按新的trigger重新设置job执行
+                await _scheduler.Result.ResumeTrigger(trigger.Key);
                 return ApiResult.Success($"启动计划任务:【{tasksQz.Name}】成功！");
             }
             catch (Exception ex)