点巡检计划定时任务

taskschedule/Tnb.TaskScheduler/TimeTaskService.cs

@@ -324,11 +324,12 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
         Action<SpareTimer, long>? action = null;
         ContentModel? comtentModel = input.ExecuteContent.ToObject<ContentModel>();
         input.ExecuteCycleJson = comtentModel.cron;
+        TaskMethodInfo? taskMethod = null;
         switch (input.ExecuteType)
         {
             case "3":
                 // 查询符合条件的任务方法
-                TaskMethodInfo? taskMethod = GetTaskMethods()?.Result.FirstOrDefault(m => m.id == comtentModel.localHostTaskId);
+                taskMethod = GetTaskMethods()?.Result.FirstOrDefault(m => m.id == comtentModel.localHostTaskId);
                 if (taskMethod == null) break;
 
                 // 创建任务对象
@@ -354,20 +355,20 @@ public class TimeTaskService : ITimeTaskService, IDynamicApiController, ITransie
         {
             interval = (starTime.ParseToDateTime() - DateTime.Now).TotalMilliseconds.ParseToInt();
         }
-        SpareTime.DoOnce(interval, action, "Once_" + input.Id);
-        SpareTime.Do(
-            () =>
-            {
-                var isRun = comtentModel.endTime.IsNullOrEmpty() ? DateTime.Now >= starTime : DateTime.Now >= starTime && DateTime.Now < endTime;
-                if (isRun)
-                {
-                    return SpareTime.GetCronNextOccurrence(comtentModel.cron);
-                }
-                else
-                {
-                    return null;
-                }
-            },
+
+        if (taskMethod.StartNow) //modifyby zhoukeda 20230516
+        {
+            SpareTime.DoOnce(interval, action, "Once_" + input.Id);
+        }
+
+        Func<DateTimeOffset?> nextHandle = null;
+        var isRun = comtentModel.endTime.IsNullOrEmpty() ? DateTime.Now >= starTime : DateTime.Now >= starTime && DateTime.Now < endTime;
+        if (isRun)
+        {
+            nextHandle = ()=>SpareTime.GetCronNextOccurrence(comtentModel.cron);
+        }
+        SpareTime.Do(nextHandle
+            ,
             action, input.Id, comtentModel.ConnectionConfig.ToJsonString(), true, executeType: SpareTimeExecuteTypes.Parallel, cancelInNoneNextTime: false);
     }