调整调度表达式

Author: surfsky

.vs/App.Scheduler/v16/.suo

@@ -91,7 +91,8 @@ static ScheduleEngine CreateEngine()
                 Data = "http://www.baidu.com",
                 Success = new DateSpan(0, 0, 0, 0, 0, 2),
                 Failure = new DateSpan(0, 0, 0, 0, 0, 0, 0, 9),
-                Schedule = new Schedule("* * * * * *")
+                Schedule = new Schedule("* * * * * * *")
+                //Schedule = new Schedule(days: new List<int> { 1 })
             });
             /*
             cfg.Jobs.Add(new Job()

NetFramework/App.Consoler/Program.cs

@@ -14,15 +14,21 @@ namespace App.Components
     internal static class Extensions
     {
         /// <summary>字符串是否为空</summary>
-        public static bool IsNullOrEmpty(this string txt)
+        public static bool IsEmpty(this string txt)
         {
             return String.IsNullOrEmpty(txt);
         }
 
         /// <summary>对象是否为空或为空字符串</summary>
-        public static bool IsNullOrEmpty(this object o)
+        public static bool IsEmpty(this object o)
         {
-            return (o == null) ? true : o.ToString().IsNullOrEmpty();
+            return (o == null) ? true : o.ToString().IsEmpty();
+        }
+
+        /// <summary>列表是否为空</summary>
+        public static bool IsEmpty<T>(this List<T> o)
+        {
+            return (o == null) ? true : (o.Count == 0);
         }
 
         /// <summary>将可空对象转化为字符串</summary>

NetFramework/App.Consoler/bin/Debug/App.Consoler.exe

@@ -88,10 +88,12 @@ public class Job : IJobRunner
         //-------------------------------------------
         // 构造函数
         //-------------------------------------------
+        /// <summary>构建任务</summary>
         public Job()
         {
             this.Runner = this.GetType();
         }
+        /// <summary>构建任务</summary>
         public Job(string id, string name, string schedule, DateSpan interval, DateSpan failure=null)
         {
             this.ID = id;

NetFramework/App.Consoler/bin/Debug/App.Consoler.pdb

@@ -27,7 +27,7 @@ public class DummyJob : IJobRunner
     {
         public bool Run(DateTime dt, string data)
         {
-            int seconds = data.IsNullOrEmpty() ? 1 : int.Parse(data);
+            int seconds = data.IsEmpty() ? 1 : int.Parse(data);
             Thread.Sleep(seconds*1000);
             return true;
         }

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

@@ -33,5 +33,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.1.*")]
-[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyVersion("1.2.2.*")]
+[assembly: AssemblyFileVersion("1.2.2.0")]

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

@@ -7,29 +7,39 @@
 namespace App.Scheduler
 {
     /// <summary>
-    /// 调度表达式：年 月 日 时 分 周
+    /// 调度表达式：年 月 日 时 分 秒 周
     /// </summary>
     [JsonConverter(typeof(ScheduleConverter))]
     public class Schedule
     {
+        string _expression;
+
         // 年月日时分秒周
-        [JsonIgnore] public List<int> Years { get; set; } = new List<int>();
-        [JsonIgnore] public List<int> Months { get; set; } = new List<int>();
-        [JsonIgnore] public List<int> Days { get; set; } = new List<int>();
-        [JsonIgnore] public List<int> Hours { get; set; } = new List<int>();
+        [JsonIgnore] public List<int> Years   { get; set; } = new List<int>();
+        [JsonIgnore] public List<int> Months  { get; set; } = new List<int>();
+        [JsonIgnore] public List<int> Days    { get; set; } = new List<int>();
+        [JsonIgnore] public List<int> Hours   { get; set; } = new List<int>();
         [JsonIgnore] public List<int> Minutes { get; set; } = new List<int>();
+        [JsonIgnore] public List<int> Seconds { get; set; } = new List<int>();
         [JsonIgnore] public List<DayOfWeek> WeekDays { get; set; } = new List<DayOfWeek>();
 
-        string _expression;
 
-        //
+        /// <summary>构建调度表达式</summary>
         public Schedule() { }
+
+        /// <summary>构建调度表达式</summary>
+        /// <param name="expression">格式如：年 月 日 时 分 秒 周</param>
+        /// <example>
+        /// * * 1 0 0 0 *       表示每月 1 日 0 点 0 分启动任务
+        /// * * * 0,12 0 0 *    表示每天 0 点和 12 点启动任务
+        /// * * * 0 0 0 1       表示每周一 0 点启动任务
+        /// </example>
         public Schedule(string expression)
         {
-            if (expression.IsNullOrEmpty())
+            if (expression.IsEmpty())
                 return;
             var parts = expression.Trim().Split(' ');
-            if (parts.Length != 6)
+            if (parts.Length != 7)
                 return;
 
             this._expression = expression;
@@ -38,10 +48,26 @@ public Schedule(string expression)
             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.WeekDays = parts[5] == "*" ? new List<DayOfWeek>() : parts[5].Split(',').CastEnum<DayOfWeek>();
+            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;
         }
 
-        // 转化为字符串
+        /// <summary>转化为字符串</summary>
         public override string ToString()
         {
             return this._expression;
@@ -50,12 +76,13 @@ public override string ToString()
         /// <summary>是否处于运行时间</summary>
         public bool InTime(DateTime dt)
         {
-            if (this.Years.Count == 0 || this.Years.Contains(dt.Year))
-                if (this.Months.Count == 0 || this.Months.Contains(dt.Month))
-                    if (this.Days.Count == 0 || this.Days.Contains(dt.Day))
-                        if (this.Hours.Count == 0 || this.Hours.Contains(dt.Hour))
-                            if (this.Minutes.Count == 0 || this.Minutes.Contains(dt.Minute))
-                                if (this.WeekDays.Count == 0 || this.WeekDays.Contains(dt.DayOfWeek))
+            if (this.Years.IsEmpty() || this.Years.Contains(dt.Year))
+                if (this.Months.IsEmpty() || this.Months.Contains(dt.Month))
+                    if (this.Days.IsEmpty() || this.Days.Contains(dt.Day))
+                        if (this.Hours.IsEmpty() || this.Hours.Contains(dt.Hour))
+                            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 false;
         }
@@ -65,7 +92,7 @@ public bool InTime(DateTime dt)
     /// <summary>
     /// 调度表达式格式化转化器
     /// </summary>
-    public class ScheduleConverter : JsonConverter
+    internal class ScheduleConverter : JsonConverter
     {
         public override bool CanConvert(Type objectType)
         {

NetFramework/App.Consoler/bin/Debug/App.Scheduler.xml

@@ -11,6 +11,7 @@ namespace App.Scheduler
     /// <summary>任务事件代理</summary>
     /// <param name="job">任务对象</param>
     /// <param name="info">附加数据</param>
+    /// <param name="success">是否成功</param>
     public delegate void JobDelegate(Job job, string info, bool success);
 
     /// <summary>
@@ -84,7 +85,7 @@ public void Stop()
         public void Start()
         {
             // 读取配置文件
-            if (!_configFile.IsNullOrEmpty())
+            if (!_configFile.IsEmpty())
             {
                 try
                 {

NetFramework/App.Scheduler/Components/Extensions.cs

@@ -5,7 +5,7 @@
 
 
 - 调度表达式参照  cron
-    (1) 顺序调整为：年 月 日 时 分 周
+    (1) 顺序调整为：年 月 日 时 分 秒 周
     (2) 每个部分可用逗号分隔
     (3) 只保留 * 通配符
 - 含依赖逻辑
@@ -57,6 +57,15 @@ public class MyJob : IJobRunner
 用代码创建 ScheduleConfig 对象
 或修改 Scheduler.config json 文件（详见后）
 
+
+其中 Schedule 表达式格式如
+
+```
+* * 1 0 0 0 *       表示每月 1 日 0 点 0 分启动任务
+* * * 0,12 0 0 *    表示每天 0 点和 12 点启动任务
+* * * 0 0 0 1       表示每周一 0 点启动任务
+```
+
 ### 运行
 
 运行App.Consoler.exe（或实现自己的宿主程序）