兼容新旧调度表达式

Author: surfsky

NetFramework/App.Scheduler/Components/Extensions.cs

@@ -67,6 +67,16 @@ public static DateTime ToDateTime(this object o)
             return o == null ? new DateTime() : DateTime.Parse(o.ToString());
         }
 
+        /// <summary>转化为列表</summary>
+        public static List<T> ToList<T>(this T[] source)
+        {
+            var result = new List<T>();
+            foreach (var item in source)
+                result.Add(item);
+            return result;
+        }
+
+
         /// <summary>转化为逗号分隔的字符串</summary>
         public static string ToCommaString(this IEnumerable source)
         {

NetFramework/App.Scheduler/Job.cs

@@ -103,6 +103,16 @@ public Job(string id, string name, string schedule, DateSpan interval, DateSpan
             this.Failure = failure ?? new DateSpan(0, 0, 0, 0, 0, 0, 0, 0);
             this.Runner = this.GetType();
         }
+        /// <summary>构建任务</summary>
+        public Job(Type  runnerType, string schedule, DateSpan success, DateSpan failure = null)
+        {
+            this.Runner = runnerType;
+            this.Name = runnerType.Name;
+            this.Schedule = new Schedule(schedule);
+            this.Success = success;
+            this.Failure = failure ?? new DateSpan(0, 0, 0, 0, 0, 0, 0, 0);
+            this.Runner = this.GetType();
+        }
 
 
         //-------------------------------------------

NetFramework/App.Scheduler/Schedule.cs

@@ -38,34 +38,38 @@ public Schedule(string expression)
         {
             if (expression.IsEmpty())
                 return;
+            this._expression = expression;
             var parts = expression.Trim().Split(' ');
-            if (parts.Length != 7)
+            if (parts.Length < 6)
                 return;
 
-            this._expression = expression;
+            // 6参数为年月日时分周；7参数为年月日时分秒周
             this.Years    = parts[0] == "*" ? new List<int>() : parts[0].Split(',').CastInt();
             this.Months   = parts[1] == "*" ? new List<int>() : parts[1].Split(',').CastInt();
             this.Days     = parts[2] == "*" ? new List<int>() : parts[2].Split(',').CastInt();
             this.Hours    = parts[3] == "*" ? new List<int>() : parts[3].Split(',').CastInt();
             this.Minutes  = parts[4] == "*" ? new List<int>() : parts[4].Split(',').CastInt();
-            this.Seconds  = parts[5] == "*" ? new List<int>() : parts[5].Split(',').CastInt();
-            this.WeekDays = parts[6] == "*" ? new List<DayOfWeek>() : parts[6].Split(',').CastEnum<DayOfWeek>();
+            if (parts.Length == 6)
+            {
+                this.WeekDays = parts[5] == "*" ? new List<DayOfWeek>() : parts[5].Split(',').CastEnum<DayOfWeek>();
+            }
+            if (parts.Length == 7)
+            {
+                this.Seconds  = parts[5] == "*" ? new List<int>() : parts[5].Split(',').CastInt();
+                this.WeekDays = parts[6] == "*" ? new List<DayOfWeek>() : parts[6].Split(',').CastEnum<DayOfWeek>();
+            }
         }
 
-        /// <summary>构建调度表达式</summary>
-        Schedule(
-            List<int> years = null, List<int> months = null, List<int> days = null,
-            List<int> hours = null, List<int> minutes = null, List<int> seconds = null, 
-            List<DayOfWeek> weekdays=null)
-        {
-            this.Years = years;
-            this.Months = months;
-            this.Days = days;
-            this.Hours = hours;
-            this.Minutes = minutes;
-            this.Seconds = seconds;
-            this.WeekDays = weekdays;
-        }
+        // 链式表达式方法
+        public Schedule SetYears(params int[] n)          { this.Years = n.ToList(); return this;}
+        public Schedule SetMonths(params int[] n)         { this.Months = n.ToList(); return this; }
+        public Schedule SetDays(params int[] n)           { this.Days = n.ToList(); return this; }
+        public Schedule SetHours(params int[] n)          { this.Hours = n.ToList(); return this; }
+        public Schedule SetMinutes(params int[] n)        { this.Minutes = n.ToList(); return this; }
+        public Schedule SetSeconds(params int[] n)        { this.Seconds = n.ToList(); return this; }
+        public Schedule SetWeekdays(params DayOfWeek[] n) { this.WeekDays = n.ToList(); return this; }
+
+
 
         /// <summary>转化为字符串</summary>
         public override string ToString()
@@ -83,7 +87,7 @@ public bool InTime(DateTime dt)
                             if (this.Minutes.IsEmpty() || this.Minutes.Contains(dt.Minute))
                                 if (this.Seconds.IsEmpty() || this.Seconds.Contains(dt.Second))
                                     if (this.WeekDays.IsEmpty() || this.WeekDays.Contains(dt.DayOfWeek))
-                                    return true;
+                                        return true;
             return false;
         }
     }

NetFramework/App.Scheduler/bin/Debug/App.Scheduler.dll

@@ -173,14 +173,6 @@ static ScheduleEngine CreateEngine()
     });
     return new ScheduleEngine(cfg);
 }
-
-/// <summary>从配置中构建引擎对象</summary>
-private static ScheduleEngine CreateEngineFromConfig()
-{
-    var folder = new FileInfo(Assembly.GetExecutingAssembly().Location).DirectoryName;
-    string configFile = string.Format("{0}\\scheduler.config", folder);
-    return new ScheduleEngine(configFile);
-}
 ```
 
 ## 8. 数据库上下文如何处理
@@ -196,7 +188,6 @@ private static ScheduleEngine CreateEngineFromConfig()
 
 ``` csharp
 
-UtilConfig.Instance.MachineId = IO.GetAppSetting<int>("MachineID");
 EntityConfig.Instance.OnGetDb += () => JobContext.Current["db"] as AppContext;
 var engine = CreateEngine();
 engine.JobRunning += (job, info, _) =>

NetFramework/App.Scheduler/bin/Debug/App.Scheduler.pdb

@@ -1,7 +1,6 @@
 ---------------------------------------------
 任务
 ---------------------------------------------
-调度循环支持到秒
 用 ShareProject 的方式共享代码
 
 开发以下客户端
@@ -14,6 +13,9 @@
 ---------------------------------------------
 完成
 ---------------------------------------------
+2020-12-04
+    /调度启动表达式支持到秒
+
 2020-12-03
     /任务上下文 JobContext.Get("db", ()=>....);
     /Job 增加 Id 属性，可被多任务共同依赖