From 6cc05f3689e7616431886ec183948c433a30220c Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 03 十二月 2024 20:51:38 +0800
Subject: [PATCH] 一些优化
---
Tiger.Business/Services/Base/TigerJobBase.cs | 161 +++++++++++++++++++++++++----------------------------
1 files changed, 75 insertions(+), 86 deletions(-)
diff --git a/Tiger.Business/Services/Base/TigerJobBase.cs b/Tiger.Business/Services/Base/TigerJobBase.cs
index f2fc093..b6b1b1d 100644
--- a/Tiger.Business/Services/Base/TigerJobBase.cs
+++ b/Tiger.Business/Services/Base/TigerJobBase.cs
@@ -125,93 +125,82 @@
{
TskJobInput tskJobInput = new TskJobInput();
var dateTime = DateTime.Now;
- if (Args.Interval > 0)
+
+ //鎸夋椂闂寸被鍨嬫潵杩愯
+ switch (Args.Type)
{
- tskJobInput.result = true;
- tskJobInput.input = new()
- {
- startTime = dateTime.AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- };
- }
- else
- {
- //鎸夋椂闂寸被鍨嬫潵杩愯
- switch (Args.Type)
- {
- case TrigArgs.EveryType.Milliseconds:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddMilliseconds(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalMilliseconds > Args.ToRunEvery;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddMilliseconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Seconds:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddSeconds(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalSeconds > Args.ToRunEvery;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddSeconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Minutes:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddMinutes(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalMinutes > Args.ToRunEvery;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddMinutes(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Hours:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddHours(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalHours > Args.ToRunEvery;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddHours(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Days:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddDays(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Weeks:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddDays(-7);
- tskJobInput.result = (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery * 7;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Weekdays:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddDays(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery;
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- case TrigArgs.EveryType.Months:
- dateTime = Trig.LastRunTime ?? DateTime.Now.AddMonths(-Args.ToRunEvery);
- tskJobInput.result = (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery * DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month);
- tskJobInput.input = new()
- {
- startTime = dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- endTime = dateTime.AddMonths(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
- };
- break;
- }
+ case TrigArgs.EveryType.Milliseconds:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddMilliseconds(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalMilliseconds > Args.ToRunEvery;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddMilliseconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Seconds:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddSeconds(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalSeconds > Args.ToRunEvery;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddSeconds(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Minutes:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddMinutes(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalMinutes > Args.ToRunEvery;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddMinutes(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Hours:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddHours(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalHours > Args.ToRunEvery;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddHours(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Days:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddDays(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Weeks:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddDays(-7);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery * 7;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Weekdays:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddDays(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery;
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddDays(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
+ case TrigArgs.EveryType.Months:
+ dateTime = Trig.LastRunTime ?? DateTime.Now.AddMonths(-Args.ToRunEvery);
+ tskJobInput.result = Args.Interval > 0 ? true : (DateTime.Now - dateTime).TotalDays > Args.ToRunEvery * DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month);
+ tskJobInput.input = new()
+ {
+ startTime = Args.Interval > 0 ? ((DateTime)Trig.LastRunTime).AddHours(-Args.Interval).ToString("yyyy-MM-dd HH:mm:ss") : dateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+ endTime = dateTime.AddMonths(Args.ToRunEvery).ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ break;
}
return tskJobInput;
}
--
Gitblit v1.9.3