From 6f3b05c06125b457d0c78e259f3befe4910881cf Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 16:54:29 +0800
Subject: [PATCH] 计划任务更新
---
Tiger.Business/Services/Base/InterfaceServiceNew.cs | 188 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 150 insertions(+), 38 deletions(-)
diff --git a/Tiger.Business/Services/Base/InterfaceServiceNew.cs b/Tiger.Business/Services/Base/InterfaceServiceNew.cs
index fae4b69..93e4aea 100644
--- a/Tiger.Business/Services/Base/InterfaceServiceNew.cs
+++ b/Tiger.Business/Services/Base/InterfaceServiceNew.cs
@@ -1,16 +1,21 @@
锘縰sing FluentScheduler;
using Newtonsoft.Json;
using Rhea.Common;
+using Sundial;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.Model;
+using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.Minsun;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
+using static Tiger.Model.TrigArgs;
namespace Tiger.Business
{
@@ -270,6 +275,37 @@
JobManager.JobException += info => Logger.Scheduler.Error("An error just happened with a scheduled job: " + info.Exception);
JobManager.JobStart += info => Logger.Scheduler.Info($"{info.Name}: started\r\n");
JobManager.JobEnd += info => Logger.Scheduler.Info($"{info.Name}: ended ({info.Duration})\r\n");
+ SaveRunningStatus(); //淇濆瓨鐘舵��
+ }
+
+ private void SaveRunningStatus()
+ {
+ List<TSK_TRIG> listTrig = new List<TSK_TRIG>();
+ foreach (var schedule in JobManager.RunningSchedules)
+ {
+ var job = Biz.Db.Queryable<TSK_JOB>().Where(q => q.JobName == schedule.Name).First();
+ if (job != null)
+ {
+ TSK_TRIG trig = new TSK_TRIG();
+ trig = Biz.Db.Queryable<TSK_TRIG>().Where(q => q.JobId == job.ID).First();
+ trig.Status = TSK_TRIG.Statuss.Running.GetValue();
+ trig.StartTime = DateTime.Now;
+ listTrig.Add(trig);
+ }
+ }
+ var db = Biz.Db;
+ //淇濆瓨鍒版暟鎹簱
+ var dbTran = db.UseTran(() =>
+ {
+ if (listTrig.Count > 0)
+ {
+ db.Updateable(listTrig, "system").UpdateColumns(q => new { q.Status, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
+ }
+ });
+ if (!dbTran.IsSuccess)
+ {
+ Logger.Scheduler.Trace(dbTran.ErrorException, $"浣滀笟淇濆瓨鍒版暟鎹簱寮傚父");
+ }
}
/// <summary>
@@ -279,34 +315,86 @@
/// <param name="newEntity"></param>
/// <param name="jobParam"></param>
/// <returns></returns>
- public ApiAction AddJob<TJob>(TJob newEntity, FluentJobParam jobParam) where TJob : class, IJob
+ public ApiAction AddTskJob<TJob>(TJob newEntity, FluentJobParam jobParam) where TJob : class, ITJob
{
ApiAction apiAction = new();
try
{
- JobManager.AddJob<TJob>((s) => GenerateSchedule(jobParam.Args, s.WithName(jobParam.JobName)));
+ if (!JobManager.AllSchedules.Any(q => q.Name == jobParam.JobName))
+ {
+ JobManager.AddJob<TJob>((s) => GenerateSchedule(jobParam.Args, s.WithName(jobParam.JobName)));
+ string guid = Guid.NewGuid().ToString("N");
+ TSK_JOB job = Biz.Db.Queryable<TSK_JOB>().Where(x => x.JobName == jobParam.JobName).First() ?? new()
+ {
+ ID = guid,
+ Remark = jobParam.Remark,
+ JobType = jobParam.JobName,
+ AssemblyName = jobParam.AssemblyName,
+ JobName = jobParam.JobName,
+ };
+ var trigger = Biz.Db.Queryable<TSK_TRIG>().Where(x => x.JobId == job.ID).First() ?? new TSK_TRIG()
+ {
+ JobId = guid,
+ StartTime = DateTime.Now,
+ NumberOfRuns = 1,
+ };
+ trigger.Args = JsonConvert.SerializeObject(jobParam.Args);
+ trigger.Status = TSK_TRIG.Statuss.Running.GetValue();
+ var db = Biz.Db;
+ //淇濆瓨鍒版暟鎹簱
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(job)
+ .WhereColumns(t => new { t.JobName, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- //Sundial.TriggerBuilder triggerBuilder = Sundial.Triggers.Period(jobParam.Period * 60 * 1000).LoadFrom(new
- //{
- // TriggerId = jobParam.JobName + "_trigger1",
- //});
- //_schedulerFactory.AddJob<TJob>(jobParam.JobName, triggerBuilder);
- //var trigger = GetJob(jobParam.JobName).GetTrigger($"{jobParam.JobName}_trigger1");
- //TSK_JOB entity = ReturnDetail(jobParam.JobName);
- //entity.Remark = jobParam.Remark;
- //entity.JobType = typeof(TJob).Name;
- //entity.JobName = jobParam.JobName;
- //entity.TriggersWithGhost = new List<TSK_TRIG> { JsonConvert.DeserializeObject<TSK_TRIG>(JsonConvert.SerializeObject(trigger)) };
- //entity.Triggers[0].Args = jobParam.Period.ToString();
- //apiAction = SaveJob(entity);
- //apiAction.Data = entity;
+ var z = db.Storageable(trigger)
+ .WhereColumns(t => new { t.JobId, t.GHOST_ROW })
+ .ToStorage();
+ z.AsInsertable.ExecuteCommand();
+ z.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ apiAction.CatchExceptionWithLog(dbTran.ErrorException, $"娣诲姞宸ヤ綔浠诲姟鏃朵繚瀛樺埌鏁版嵁搴撳紓甯�");
+ }
+ }
}
catch (System.Exception ex)
{
- Logger.Console.Fatal(ex, "Add Job From DB Exception");
+ apiAction.CatchExceptionWithLog(ex);
}
+ if (!apiAction.IsSuccessed) { JobManager.RemoveJob(jobParam.JobName); }
return apiAction;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎浣滀笟
+ /// </summary>
+ /// <param name="jobname"></param>
+ public void RemovefJob(string jobname)
+ {
+ if (JobManager.AllSchedules.Any(q => q.Name == jobname))
+ {
+ string guid = Guid.NewGuid().ToString("N");
+ TSK_JOB job = Biz.Db.Queryable<TSK_JOB>().Where(x => x.JobName == jobname).First();
+ var trigger = Biz.Db.Queryable<TSK_TRIG>().Where(x => x.JobId == job.ID).First();
+ trigger.Status = TSK_TRIG.Statuss.Stop.GetValue();
+ var db = Biz.Db;
+ //淇濆瓨鍒版暟鎹簱
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(trigger, "system_job").UpdateColumns(q=>new { q.Status,q.UPDATE_TIME,q.UPDATE_USER}).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ Logger.Scheduler.Fatal(dbTran.ErrorException, $"娣诲姞宸ヤ綔浠诲姟鏃朵繚瀛樺埌鏁版嵁搴撳紓甯�");
+ }
+ }
+ JobManager.RemoveJob(jobname);
}
/// <summary>
@@ -321,12 +409,15 @@
var jobs = Biz.Db.Queryable<TSK_JOB>().IncludesAllFirstLayer().ToList();
foreach (var job in jobs)
{
- Type type = Type.GetType($"{job.AssemblyName}.{job.JobType},{job.AssemblyName}", throwOnError: true);
- dynamic _type = Activator.CreateInstance(type);
- TrigArgs args = JsonConvert.DeserializeObject<TrigArgs>(job.Triggers[0].Args);
- Schedule schedule = Schedule(_type, job.JobName, registry);
- //鐢熸垚璁″垝
- GenerateSchedule(args, schedule);
+ if (job.JobName == "fU9C_MES_GetWo" || job.JobName == "fTest")
+ {
+ Type type = Type.GetType($"{job.AssemblyName}.{job.JobType},{job.AssemblyName}", throwOnError: true);
+ dynamic _type = Activator.CreateInstance(type);
+ TrigArgs args = JsonConvert.DeserializeObject<TrigArgs>(job.Triggers[0].Args);
+ Schedule schedule = Schedule(_type, job.JobName, registry);
+ //鐢熸垚璁″垝
+ GenerateSchedule(args, schedule);
+ }
}
}
catch (System.Exception ex)
@@ -344,9 +435,9 @@
/// <param name="JobName"></param>
/// <param name="registry"></param>
/// <returns></returns>
- private Schedule Schedule<TJob>(TJob entity, string JobName, Registry registry) where TJob : class, IJob
+ private Schedule Schedule<TJob>(TJob entity, string JobName, Registry registry) where TJob : class, ITJob
{
- return registry.Schedule<TJob>().WithName(JobName);
+ return registry.Schedule<TJob>().WithName(typeof(TJob).Name);
}
/// <summary>
@@ -358,12 +449,23 @@
{
SpecificTimeUnit specificTimeUnit = null;
TimeUnit timeUnit = null;
- if (args.NonReentrant == "Y") { schedule = schedule.NonReentrant(); }
- if (args.ToRunNow == "Y") { specificTimeUnit = schedule.ToRunNow(); }
- if (args.ToRunOnceAt == "Y") { specificTimeUnit = schedule.ToRunOnceAt(args.ToRunOnceAtDt.AddMinutes(args.NowAddMinutes)); }
- if (args.ToRunOnceIn > 0) { timeUnit = schedule.ToRunOnceIn(args.ToRunOnceIn); }
- else if (args.ToRunEvery >= 0) { timeUnit = schedule.ToRunEvery(args.ToRunEvery); }
- if (specificTimeUnit != null && args.AndEvery>0) { timeUnit = specificTimeUnit.AndEvery(args.AndEvery); }
+ if (args.NonReentrant == "Y") { schedule = schedule.NonReentrant(); } //灏辨槸鏄惁璺熶箣鍓嶇殑杩樻病杩愯瀹岀殑璁″垝鍚屾椂杩愯銆�
+ switch (args.runType)
+ {
+ case RunType.ToRunNow:
+ specificTimeUnit = schedule.ToRunNow(); //椹笂杩愯
+ break;
+ case RunType.ToRunOnceAt:
+ specificTimeUnit = schedule.ToRunOnceAt(args.ToRunOnceAtDt.AddMinutes(args.NowAddMinutes)); //杩愯涓�娆″湪鍝釜鏃堕棿,
+ break;
+ case RunType.ToRunOnceIn:
+ timeUnit = schedule.ToRunOnceIn(args.ToRunOnceIn); //鍦ㄥ灏戝悗杩愯涓�娆�
+ break;
+ case RunType.ToRunEvery:
+ timeUnit = schedule.ToRunEvery(args.ToRunEvery); //姣忛殧澶氬皯杩愯涓�鍥�
+ break;
+ }
+ if (specificTimeUnit != null) { timeUnit = specificTimeUnit.AndEvery(args.ToRunEvery); } //姣忛殧澶氬皯杩愯涓�鍥烇紝鍔犲湪ToRunNow銆乀oRunOnceAt鍚庨潰
//鎸夋椂闂寸被鍨嬫潵杩愯
switch (args.Type)
{
@@ -371,7 +473,7 @@
timeUnit.Milliseconds();
break;
case TrigArgs.EveryType.Seconds:
- timeUnit.Seconds();
+ timeUnit.Seconds(); //琛ㄧず鎸夌锛屽灏戠瑕佺湅鍓嶉潰Every鐨勬暟锛屾瘮濡傦細ToRunEvery(5).Seconds() 杩欎釜灏辫〃绀� 闅�5绉掕繍琛屼竴娆�
break;
case TrigArgs.EveryType.Minutes:
timeUnit.Minutes();
@@ -379,7 +481,7 @@
case TrigArgs.EveryType.Hours:
if (args.Minutes > 0)
{
- timeUnit.Hours().At(args.Minutes);
+ timeUnit.Hours().At(args.Minutes); //琛ㄧず鎸夋瘡灏忔椂鐨勫垎閽燂紝澶氬皯鍒嗚鐪嬪墠闈very鐨勬暟锛屾瘮濡傦細ToRunEvery(1).Hours().At(5) 杩欎釜灏辫〃绀� 闅�1灏忔椂鐨勭5鍒嗛挓杩愯涓�娆�
}
else
{
@@ -387,9 +489,9 @@
}
break;
case TrigArgs.EveryType.Days:
- if (args.Hours > 0 && args.Minutes > 0)
+ if (args.Hours > 0)
{
- timeUnit.Days().At(args.Hours, args.Minutes);
+ timeUnit.Days().At(args.Hours, args.Minutes); //琛ㄧず鎸夊ぉ锛屽灏戝ぉ瑕佺湅鍓嶉潰Every鐨勬暟锛屾瘮濡傦細ToRunEvery(2).Days().At(14, 15) 杩欎釜灏辫〃绀� 闅�2澶╃殑14:15杩愯涓�娆�
}
else
{
@@ -397,9 +499,9 @@
}
break;
case TrigArgs.EveryType.Weeks:
- if (args.Hours > 0 && args.Minutes > 0)
+ if (args.Hours > 0)
{
- timeUnit.Weeks().At(args.Hours, args.Minutes);
+ timeUnit.Weeks().At(args.Hours, args.Minutes); //琛ㄧず鎸夊懆锛屽灏戝懆瑕佺湅鍓嶉潰Every鐨勬暟锛屾瘮濡傦細ToRunEvery(1).Weeks().At(14, 15) 杩欎釜灏辫〃绀� 闅�1鍛ㄧ殑14:15杩愯涓�娆�
}
else
{
@@ -407,7 +509,7 @@
}
break;
case TrigArgs.EveryType.Weekdays:
- if (args.Hours > 0 && args.Minutes > 0)
+ if (args.Hours > 0)
{
timeUnit.Weekdays().At(args.Hours, args.Minutes);
}
@@ -416,6 +518,16 @@
timeUnit.Weekdays();
}
break;
+ case TrigArgs.EveryType.Months:
+ if (args.Days > 0 && args.Hours > 0)
+ {
+ timeUnit.Months().On(args.Days).At(args.Hours, args.Minutes);
+ }
+ else
+ {
+ timeUnit.Months();
+ }
+ break;
}
}
--
Gitblit v1.9.3