TigerClouds-Tech/Server/TigerApi6_2024.git

			@@ -5,19 +5,23 @@
			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
			{
			/// <summary>
			///
			/// </summary>
			public class InterfaceServiceNew: IInterfaceService
			public class InterfaceServiceNew : IInterfaceService
			{
			#region Sundial计划调度旧版本使用

			@@ -40,7 +44,7 @@
			public ApiAction AddJob<TJob>(TJob newEntity, TskJobParam jobParam) where TJob : class, Sundial.IJob
			{
			ApiAction apiAction = new();
			Sundial.TriggerBuilder triggerBuilder = Sundial.Triggers.Period(jobParam.Period601000).LoadFrom(new
			Sundial.TriggerBuilder triggerBuilder = Sundial.Triggers.Period(jobParam.Period * 60 * 1000).LoadFrom(new
			{
			TriggerId = jobParam.JobName + "_trigger1",
			});
			@@ -203,20 +207,20 @@
			{
			try
			{
			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);
			_schedulerFactory.AddJob(type, job.JobName, Sundial.Triggers.Period(Convert.ToInt32(job.Triggers?[0].Args ?? "3") * 60 * 1000));
			if (job.Triggers[0]?.Status == 3)
			{
			Work.DoAsync(() =>
			{
			Thread.Sleep(2000);
			PauseJob(job.JobName);
			});
			}
			}
			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);
			_schedulerFactory.AddJob(type, job.JobName, Sundial.Triggers.Period(Convert.ToInt32(job.Triggers?[0].Args ?? "3") * 60 * 1000));
			if (job.Triggers[0]?.Status == 3)
			{
			Work.DoAsync(() =>
			{
			Thread.Sleep(2000);
			PauseJob(job.JobName);
			});
			}
			}
			}
			catch (System.Exception ex)
			{
			@@ -266,10 +270,38 @@
			/// </summary>
			public void JobInitialize()
			{
			JobManager.Initialize();
			JobManager.Initialize(AddJobsFromDB());
			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");
			JobManager.JobEnd += info => Logger.Scheduler.Info($"{info.Name}: ended ({info.Duration})");
			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() {
			TSK_TRIG trig = new 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)
			{
			trig = Biz.Db.Queryable<TSK_TRIG>().Where(q => q.JobId == job.ID).First();
			trig.Status = TSK_TRIG.Statuss.Running.GetValue();
			trig.StartTime = DateTime.Now;
			}
			}
			var db = Biz.Db;
			//保存到数据库
			var dbTran = db.UseTran(() =>
			{
			if (trig != null)
			{
			db.Updateable(trig, "system").UpdateColumns(q => new { q.Status, q.UPDATE_USER, q.UPDATE_TIME }).ExecuteCommand();
			}
			});
			if (!dbTran.IsSuccess)
			{
			Logger.Scheduler.Trace(dbTran.ErrorException, $"作业保存到数据库异常");
			}
			}

			/// <summary>
			@@ -279,25 +311,51 @@
			/// <param name="newEntity"></param>
			/// <param name="jobParam"></param>
			/// <returns></returns>
			public ApiAction AddJob<TJob>(TJob newEntity, FluentJobParam jobParam) where TJob : class, IJob
			public ApiAction AddJob<TJob>(TJob newEntity, FluentJobParam jobParam) where TJob : class, ITJob
			{
			ApiAction apiAction = new();
			try
			{
			JobManager.AddJob<TJob>((s) => s.ToRunEvery(5).Seconds());
			//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);
			JobManager.AddJob<TJob>((s) => GenerateSchedule(jobParam.Args, s.WithName(typeof(TJob).Name)));
			string guid = Guid.NewGuid().ToString("N");
			var trigger = new TSK_TRIG()
			{
			JobId = guid,
			Args = JsonConvert.SerializeObject(jobParam.Args),
			Status = TSK_TRIG.Statuss.Running.GetValue(),
			StartTime = DateTime.Now,
			NumberOfRuns = 1,
			};
			TSK_JOB job = new()
			{
			ID = guid,
			Remark = jobParam.Remark,
			JobType = typeof(TJob).Name,
			AssemblyName = jobParam.AssemblyName,
			JobName = jobParam.JobName,
			};
			if (Biz.Db.Queryable<TSK_JOB>().Any(q=>q.JobName == typeof(TJob).Name)) {
			apiAction.IsSuccessed = false;
			apiAction.LocaleMsg = new($"任务已经存在");
			return apiAction;
			}
			var db = Biz.Db;
			//保存到数据库
			var dbTran = db.UseTran(() =>
			{
			if (job != null)
			{
			db.Insertable(job, "system").ExecuteCommand();
			}
			if (trigger != null)
			{
			db.Insertable(trigger, "system").ExecuteCommand();
			}
			});
			if (!dbTran.IsSuccess)
			{
			Logger.Scheduler.Trace(dbTran.ErrorException, $"添加工作任务时保存到数据库异常");
			}
			//apiAction.Data = entity;

			}
			@@ -309,87 +367,39 @@
			}

			/// <summary>
			/// 删除作业
			/// </summary>
			/// <param name="jobname"></param>
			public void RemovefJob(string jobname)
			{
			JobManager.RemoveJob(jobname);
			}

			/// <summary>
			/// 从数据库批量添加任务
			/// </summary>
			public void AddJobsFromDB()
			public Registry AddJobsFromDB()
			{
			// 声明一个Registry类
			var registry = new Registry();
			try
			{
			var jobs = Biz.Db.Queryable<TSK_JOB>().IncludesAllFirstLayer().ToList();
			// 声明一个Registry类
			var registry = new Registry();
			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);
			SpecificTimeUnit specificTimeUnit = null;
			TimeUnit timeUnit = null;
			if (args.NonReentrant == "Y") { schedule = schedule.NonReentrant(); }
			if (args.ToRunNow == "Y") { specificTimeUnit = schedule.ToRunNow(); }
			if (args.ToRunOnceIn > 0) { timeUnit = schedule.ToRunOnceIn(args.ToRunOnceIn); }
			else if (args.ToRunEvery >= 0) { timeUnit = schedule.ToRunEvery(args.ToRunEvery); }
			//按时间类型来运行
			switch (args.Type)
			{
			case TrigArgs.EveryType.Milliseconds:
			timeUnit.Milliseconds();
			break;
			case TrigArgs.EveryType.Seconds:
			timeUnit.Seconds();
			break;
			case TrigArgs.EveryType.Minutes:
			timeUnit.Minutes();
			break;
			case TrigArgs.EveryType.Hours:
			if (args.Minutes > 0)
			{
			timeUnit.Hours().At(args.Minutes);
			}
			else
			{
			timeUnit.Hours();
			}
			break;
			case TrigArgs.EveryType.Days:
			if (args.Hours>0 && args.Minutes > 0 )
			{
			timeUnit.Days().At(args.Hours, args.Minutes);
			}
			else
			{
			timeUnit.Days();
			}
			break;
			case TrigArgs.EveryType.Weeks:
			if (args.Hours > 0 && args.Minutes > 0)
			{
			timeUnit.Weeks().At(args.Hours, args.Minutes);
			}
			else
			{
			timeUnit.Weeks();
			}
			break;
			case TrigArgs.EveryType.Weekdays:
			if (args.Hours > 0 && args.Minutes > 0)
			{
			timeUnit.Weekdays().At(args.Hours, args.Minutes);
			}
			else
			{
			timeUnit.Weekdays();
			}
			break;
			}

			Schedule schedule = Schedule(_type, job.JobName, registry);
			//生成计划
			GenerateSchedule(args, schedule);
			}
			}
			catch (System.Exception ex)
			{
			Logger.Console.Fatal(ex, "Add Job From DB Exception");
			}
			return registry;
			}

			/// <summary>
			@@ -400,9 +410,100 @@
			/// <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>
			/// 生成计划
			/// </summary>
			/// <param name="args"></param>
			/// <param name="schedule"></param>
			private void GenerateSchedule(TrigArgs args, Schedule schedule)
			{
			SpecificTimeUnit specificTimeUnit = null;
			TimeUnit timeUnit = null;
			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、ToRunOnceAt后面
			//按时间类型来运行
			switch (args.Type)
			{
			case TrigArgs.EveryType.Milliseconds:
			timeUnit.Milliseconds();
			break;
			case TrigArgs.EveryType.Seconds:
			timeUnit.Seconds(); //表示按秒，多少秒要看前面Every的数，比如：ToRunEvery(5).Seconds() 这个就表示隔5秒运行一次
			break;
			case TrigArgs.EveryType.Minutes:
			timeUnit.Minutes();
			break;
			case TrigArgs.EveryType.Hours:
			if (args.Minutes > 0)
			{
			timeUnit.Hours().At(args.Minutes); //表示按每小时的分钟，多少分要看前面Every的数，比如：ToRunEvery(1).Hours().At(5) 这个就表示隔1小时的第5分钟运行一次
			}
			else
			{
			timeUnit.Hours();
			}
			break;
			case TrigArgs.EveryType.Days:
			if (args.Hours > 0)
			{
			timeUnit.Days().At(args.Hours, args.Minutes); //表示按天，多少天要看前面Every的数，比如：ToRunEvery(2).Days().At(14, 15) 这个就表示隔2天的14:15运行一次
			}
			else
			{
			timeUnit.Days();
			}
			break;
			case TrigArgs.EveryType.Weeks:
			if (args.Hours > 0)
			{
			timeUnit.Weeks().At(args.Hours, args.Minutes); //表示按周，多少周要看前面Every的数，比如：ToRunEvery(1).Weeks().At(14, 15) 这个就表示隔1周的14:15运行一次
			}
			else
			{
			timeUnit.Weeks();
			}
			break;
			case TrigArgs.EveryType.Weekdays:
			if (args.Hours > 0 )
			{
			timeUnit.Weekdays().At(args.Hours, args.Minutes);
			}
			else
			{
			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;
			}
			}

			/// <summary>
			@@ -416,7 +517,8 @@
			/// <summary>
			/// 在任务完成后等待或者停止
			/// </summary>
			public void StopAndBlock() {
			public void StopAndBlock()
			{
			JobManager.StopAndBlock();
			}