From 02af3287e8dd054d39d8d8158041323437cbf9a7 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期一, 28 十月 2024 15:12:35 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.Business.MES/Task/Jobs.U9C_ME_GetSupplier.cs | 52 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetSupplier.cs b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetSupplier.cs index eaaf92f..5619878 100644 --- a/Tiger.Business.MES/Task/Jobs.U9C_ME_GetSupplier.cs +++ b/Tiger.Business.MES/Task/Jobs.U9C_ME_GetSupplier.cs @@ -1,11 +1,12 @@ 锘縰sing Rhea.Common; -using Sundial; +using FluentScheduler; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json; using Tiger.IBusiness; using Tiger.Model; using Tiger.Model.Minsun; @@ -15,39 +16,54 @@ /// <summary> /// 浠嶶9C鑾峰彇渚涘簲鍟嗕俊鎭� /// </summary> - public class U9C_ME_GetSupplier : TigerJobBase, ITigerJob + public class U9C_ME_GetSupplier : TigerJobBase, ITJob { public string Id { get; set; } = Guid.NewGuid().ToString("N"); - public string Tag { get; set; } = "U9C_ME_GetSupplier Interface Job"; - public string Name { get; set; } = "U9C_ME_GetSupplier Interface Job"; + public string Tag { get; set; } + public string Name { get; set; } - public async Task ExecuteAsync(JobExecutingContext context, CancellationToken stoppingToken) + public U9C_ME_GetSupplier() { - Logger.Scheduler.Info(context.Trigger.ConvertToMonitor()); + Id = Guid.NewGuid().ToString("N"); + Tag = "U9C_ME_GetSupplier Interface Job"; + GetJob(typeof(U9C_ME_GetSupplier).Name); + Name = Job.JobName; + } + + public void Execute() + { + Logger.Scheduler.Info($"杩涘叆璁″垝璋冨害(鍚嶇О:{Name})...\r\n"); try { - var _lastRunTime = Biz.SysParam["Vender_LastTime", "Interface_LastRun"].PARAM_VALUE; - var LastRunTime = string.IsNullOrEmpty(_lastRunTime) ? DateTime.Now.AddDays(-1) : Convert.ToDateTime(_lastRunTime); - if ((DateTime.Now - LastRunTime).TotalDays > 1) + Schedule = JobManager.GetSchedule(Name); + StartTime = DateTime.Now; + string msg = ""; + string status = "Successed"; + GetJob(typeof(U9C_ME_GetSupplier).Name); + TskJobInput tskJobInput = CheckIFCanGo(); + if (tskJobInput.result) { - GetSupplierInput input = new GetSupplierInput - { - startTime = LastRunTime.ToString("yyyy-MM-dd HH:mm:ss"), - endTime = LastRunTime.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss") - }; - var result = await DI.Resolve<IU9C_MES>().GetSupplier(input); + var result = DI.Resolve<IU9C_MES>().GetSupplier(tskJobInput.input); if (!result.IsSuccessed) { - Logger.Scheduler.Error($"鑾峰彇渚涘簲鍟嗕俊鎭紓甯�:{result.Message}"); + msg = $"鑾峰彇渚涘簲鍟嗕俊鎭紓甯�:{result.Message}"; + Logger.Scheduler.Error(msg); + status = "Failed"; + } + else + { + msg = $"浠嶶9C鑾峰彇渚涘簲鍟嗕俊鎭垚鍔�:{result.Message}"; + Trig.LastRunTime = (tskJobInput.input.endTime.ToDateTime() - DateTime.Now).TotalMinutes > 0 ? Trig.LastRunTime : tskJobInput.input.endTime.ToDateTime(); } } - //SaveLog(context, "浠嶶9C鑾峰彇渚涘簲鍟嗕俊鎭垚鍔�"); + SaveFluentSchedulerLog(status, $"{msg}"); + Logger.Scheduler.Info($"璁″垝璋冨害(鍚嶇О:{Name})瀹屾垚锛岃繑鍥炰俊鎭�:{msg}\r\n"); } catch (System.Exception ex) { Logger.Scheduler.Fatal(ex, "鑾峰彇渚涘簲鍟嗕俊鎭紓甯�"); + SaveFluentSchedulerLog("Failed", ex.Message); } - await Task.CompletedTask; } } } -- Gitblit v1.9.3