From 85a299f3ffe2dd47132f7f0f79146f3675bdc273 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 14 四月 2025 15:27:34 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business/Services/Base/InterfaceServiceNew.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/Tiger.Business/Services/Base/InterfaceServiceNew.cs b/Tiger.Business/Services/Base/InterfaceServiceNew.cs
index 5b362a3..d67e481 100644
--- a/Tiger.Business/Services/Base/InterfaceServiceNew.cs
+++ b/Tiger.Business/Services/Base/InterfaceServiceNew.cs
@@ -291,6 +291,7 @@
trig = Biz.Db.Queryable<TSK_TRIG>().Where(q => q.JobId == job.ID).First();
trig.Status = TSK_TRIG.Statuss.Running.GetValue();
trig.StartTime = DateTime.Now;
+ trig.NextRunTime = schedule.NextRun;
listTrig.Add(trig);
}
}
@@ -418,15 +419,12 @@
var jobs = Biz.Db.Queryable<TSK_JOB>().IncludesAllFirstLayer().ToList();
foreach (var job in jobs)
{
- //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);
- }
+ 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)
@@ -541,6 +539,47 @@
}
/// <summary>
+ /// 绔嬪嵆杩愯
+ /// </summary>
+ /// <param name="jobname"></param>
+ public ApiAction ImmediateRun<TJob>(TJob newEntity, string jobname) where TJob : class, ITJob
+ {
+ ApiAction apiAction = new();
+ try
+ {
+ if (JobManager.AllSchedules.Any(q => q.Name == jobname))
+ {
+ JobManager.RemoveJob(jobname);
+ string guid = Guid.NewGuid().ToString("N");
+ TSK_JOB job = Biz.Db.Queryable<TSK_JOB>().Where(x => x.JobName == jobname).IncludesAllFirstLayer().First();
+ var trigger = job.Triggers[0];
+ TrigArgs args = JsonConvert.DeserializeObject<TrigArgs>(job.Triggers[0].Args);
+ args.runType = RunType.ToRunNow;
+ JobManager.AddJob<TJob>((s) => GenerateSchedule(args, s.WithName(jobname)));
+ trigger.Status = TSK_TRIG.Statuss.Running.GetValue();
+ trigger.Args = JsonConvert.SerializeObject(args);
+
+ var db = Biz.Db;
+ //淇濆瓨鍒版暟鎹簱
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(trigger, "system_ImmediateRun_job").UpdateColumns(q => new { q.Status, q.Args, q.UPDATE_TIME, q.UPDATE_USER }).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ Logger.Scheduler.Fatal(dbTran.ErrorException, $"绔嬪嵆杩愯宸ヤ綔浠诲姟鏃朵繚瀛樼姸鎬佸埌鏁版嵁搴撳紓甯�");
+ }
+ apiAction.LocaleMsg = new($"绔嬪嵆杩愯宸ヤ綔浠诲姟鎴愬姛");
+ }
+ }
+ catch (System.Exception ex)
+ {
+ apiAction.CatchExceptionWithLog(ex);
+ }
+ return apiAction;
+ }
+
+ /// <summary>
/// 鍋滄鏈嶅姟
/// </summary>
public void Stop()
--
Gitblit v1.9.3