From 57ea0620604225272d621432ed524586846dd90e Mon Sep 17 00:00:00 2001 From: huangxianguo Date: Fri, 13 Sep 2024 18:44:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A1=86=E6=9E=B6=E5=92=8C=E9=85=8D=E7=BD=AE=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Annotation/ScheduledJobAttribute.cs | 11 +++ .../Scheduler/QuartzScheduler.cs | 57 +++++++++++ .../Scheduler/SchedulerHelper.cs | 98 ------------------- MasstransferCommon/Utils/AssemblyUtil.cs | 49 ++++++++++ .../DataExporter/FormulaService.cs | 43 +------- .../DataExporter/Model/AxisPositionParams.cs | 4 - .../DataExporter/Model/AxisVariables.cs | 3 - .../DataExporter/Model/FormulaDTO.cs | 17 ++-- .../DataExporter/Model/SystemParamsDTO.cs | 4 + .../DataExporter/SystemParamsService.cs | 40 +++++++- MasstransferExporter/Jobs/CoordinateJob.cs | 25 +++++ MasstransferExporter/Jobs/FormulaJob.cs | 24 +++++ MasstransferExporter/Jobs/HeartbeatJob.cs | 24 +++++ MasstransferExporter/Jobs/ImageExportJob.cs | 25 +++++ MasstransferExporter/Jobs/Job.cs | 9 ++ MasstransferExporter/Jobs/LogExportJob.cs | 24 +++++ .../Jobs/OperationLogExportJob.cs | 24 +++++ MasstransferExporter/Jobs/StrikeRecordJob.cs | 24 +++++ MasstransferExporter/Jobs/SystemParamJob.cs | 24 +++++ .../Jobs/SystemStatExportJob.cs | 24 +++++ MasstransferExporter/Program.cs | 55 +++++------ .../StatExporter/HeartbeatExporter.cs | 12 +-- .../Database/Sqlite/SqliteHelper.cs | 2 +- .../Mqtt/Client/MessageQueueHelper.cs | 19 +++- 24 files changed, 438 insertions(+), 203 deletions(-) create mode 100644 MasstransferCommon/Annotation/ScheduledJobAttribute.cs create mode 100644 MasstransferCommon/Scheduler/QuartzScheduler.cs delete mode 100644 MasstransferCommon/Scheduler/SchedulerHelper.cs create mode 100644 MasstransferCommon/Utils/AssemblyUtil.cs create mode 100644 MasstransferExporter/Jobs/CoordinateJob.cs create mode 100644 MasstransferExporter/Jobs/FormulaJob.cs create mode 100644 MasstransferExporter/Jobs/HeartbeatJob.cs create mode 100644 MasstransferExporter/Jobs/ImageExportJob.cs create mode 100644 MasstransferExporter/Jobs/Job.cs create mode 100644 MasstransferExporter/Jobs/LogExportJob.cs create mode 100644 MasstransferExporter/Jobs/OperationLogExportJob.cs create mode 100644 MasstransferExporter/Jobs/StrikeRecordJob.cs create mode 100644 MasstransferExporter/Jobs/SystemParamJob.cs create mode 100644 MasstransferExporter/Jobs/SystemStatExportJob.cs diff --git a/MasstransferCommon/Annotation/ScheduledJobAttribute.cs b/MasstransferCommon/Annotation/ScheduledJobAttribute.cs new file mode 100644 index 0000000..620f654 --- /dev/null +++ b/MasstransferCommon/Annotation/ScheduledJobAttribute.cs @@ -0,0 +1,11 @@ +namespace MasstransferCommon.Annotation; + +/// +/// 通过添加特性注解实现开启定时任务 +/// +/// +[AttributeUsage(AttributeTargets.Class, Inherited = false)] +public class ScheduledJobAttribute(string cron) : Attribute +{ + public string Cron { get; } = cron; +} \ No newline at end of file diff --git a/MasstransferCommon/Scheduler/QuartzScheduler.cs b/MasstransferCommon/Scheduler/QuartzScheduler.cs new file mode 100644 index 0000000..192cfb0 --- /dev/null +++ b/MasstransferCommon/Scheduler/QuartzScheduler.cs @@ -0,0 +1,57 @@ +using System.Reflection; +using MasstransferCommon.Annotation; +using MasstransferCommon.Utils; +using Quartz; +using Quartz.Impl; + +namespace MasstransferCommon.Scheduler; + +/// +/// 定时任务器 +/// +public class QuartzScheduler +{ + private readonly IScheduler _scheduler; + + private QuartzScheduler() + { + var schedulerFactory = new StdSchedulerFactory(); + _scheduler = schedulerFactory.GetScheduler().Result; + } + + public static QuartzScheduler Instance { get; } = new(); + + /// + /// 启动定时任务器 + /// + public async Task StartAsync() + { + await _scheduler.Start(); + + // 查找所有带有 ScheduledJobAttribute 的类 + var jobs = AssemblyUtil.GetTypesByAttribute(typeof(ScheduledJobAttribute)); + + foreach (var job in jobs) + { + var attribute = job.GetCustomAttribute(); + var jobDetail = JobBuilder.Create(job) + .WithIdentity(job.Name) + .Build(); + + var trigger = TriggerBuilder.Create() + .WithIdentity($"{job.Name}.trigger") + .WithCronSchedule(attribute!.Cron) + .Build(); + + await _scheduler.ScheduleJob(jobDetail, trigger); + } + } + + /// + /// 停止定时器 + /// + public async Task StopAsync() + { + await _scheduler.Shutdown(); + } +} \ No newline at end of file diff --git a/MasstransferCommon/Scheduler/SchedulerHelper.cs b/MasstransferCommon/Scheduler/SchedulerHelper.cs deleted file mode 100644 index 6f474c0..0000000 --- a/MasstransferCommon/Scheduler/SchedulerHelper.cs +++ /dev/null @@ -1,98 +0,0 @@ -using Quartz; -using Quartz.Impl; -using Serilog; - -namespace MasstransferCommon.scheduler; - -public class SchedulerHelper -{ - private static readonly Lazy lazyScheduler = new(() => InitSchedulerAsync().GetAwaiter().GetResult()); - - private static readonly Dictionary _jobDetails = new(); - - private static IScheduler Scheduler => lazyScheduler.Value; - - private static async Task InitSchedulerAsync() - { - try - { - return await new StdSchedulerFactory().GetScheduler(); - } - catch (Exception ex) - { - Log.Error($"Failed to initialize scheduler: {ex.Message}"); - throw; - } - } - - public static async Task Start() - { - await Scheduler.Start(); - } - - public static async Task SchedulerInterval(Dictionary? data, int interval, - string group = "defaultGroup") where T : IJob - { - var job = CreateJob(data, group); - - var trigger = TriggerBuilder.Create() - .WithIdentity(typeof(T).Name, group) - .StartNow() - .WithSimpleSchedule(x => x.WithIntervalInSeconds(interval).RepeatForever()) - .Build(); - - await Scheduler.ScheduleJob(job, trigger); - } - - public static async Task SchedulerCorn(Dictionary? data, string? cronExpression, - string group = "defaultGroup") where T : IJob - { - var job = CreateJob(data, group); - - var trigger = TriggerBuilder.Create() - .WithIdentity(typeof(T).Name, group) - .StartNow() - .WithSchedule(CronScheduleBuilder.CronSchedule(cronExpression)) - .Build(); - - await Scheduler.ScheduleJob(job, trigger); - } - - private static IJobDetail CreateJob(Dictionary? data, string group) where T : IJob - { - if (_jobDetails.ContainsKey(typeof(T).Name)) return _jobDetails[typeof(T).Name]; - - var job = JobBuilder.Create() - .WithIdentity(typeof(T).Name, group) - .Build(); - - if (data != null && data.Count > 0) - foreach (var item in data) - job.JobDataMap.Add(item.Key, item.Value); - - _jobDetails[typeof(T).Name] = job; - return job; - } - - public static async Task PauseJob(string group = "defaultGroup") - { - if (_jobDetails.ContainsKey(typeof(T).Name)) await Scheduler.PauseJob(JobKey.Create(typeof(T).Name, group)); - } - - public static async Task ResumeJob(string group = "defaultGroup") - { - if (_jobDetails.ContainsKey(typeof(T).Name)) await Scheduler.ResumeJob(JobKey.Create(typeof(T).Name, group)); - } - - public static async Task Shutdown() - { - if (!Scheduler.IsShutdown) await Scheduler.Shutdown(); - } - - public static async Task TriggerOnceImmediately(string group = "defaultGroup") where T : IJob - { - if (!_jobDetails.ContainsKey(typeof(T).Name)) return; - - await Scheduler.TriggerJob(new JobKey(typeof(T).Name, group)); - } -} \ No newline at end of file diff --git a/MasstransferCommon/Utils/AssemblyUtil.cs b/MasstransferCommon/Utils/AssemblyUtil.cs new file mode 100644 index 0000000..ac8a93f --- /dev/null +++ b/MasstransferCommon/Utils/AssemblyUtil.cs @@ -0,0 +1,49 @@ +using System.Reflection; + +namespace MasstransferCommon.Utils; + +/// +/// 包含程序集相关的工具类 +/// +public class AssemblyUtil +{ + private const string Token = "masstransfer"; + + /// + /// 根据注解来获取类信息 + /// + /// + /// + public static List GetTypesByAttribute(Type attributeType) + { + return GetAssemblies() + .SelectMany(a => a.GetTypes() + .Where(t => t.GetCustomAttributes(attributeType, true).Length > 0)) + .ToList(); + } + + private static IEnumerable GetAssemblies() + { + var assemblies = new List(); + foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) + { + var name = assembly.GetName().Name; + if (name != null && name.ToLower().Contains(Token)) GetReferenceAssemblies(assembly, assemblies); + } + + return assemblies; + } + + private static void GetReferenceAssemblies(Assembly assembly, ICollection assemblies) + { + foreach (var assemblyName in assembly.GetReferencedAssemblies()) + { + var name = assemblyName.Name; + if (name == null || !name.ToLower().Contains(Token)) continue; + var ass = Assembly.Load(assemblyName); + if (assemblies.Contains(ass)) continue; + assemblies.Add(ass); + GetReferenceAssemblies(ass, assemblies); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/DataExporter/FormulaService.cs b/MasstransferExporter/DataExporter/FormulaService.cs index 2c3bff6..b12f238 100644 --- a/MasstransferExporter/DataExporter/FormulaService.cs +++ b/MasstransferExporter/DataExporter/FormulaService.cs @@ -52,8 +52,6 @@ public class FormulaService var pcbSetting = formulaDto.PcbSetting; var waferSetting = formulaDto.WaferSetting; var jobSetting = formulaDto.JobSetting; - var axisPositionParams = formulaDto.AxisPositionParams; - var axisVariables = formulaDto.AxisVariables; if (algorithmParams != null) { @@ -120,28 +118,6 @@ public class FormulaService Db.SaveOrUpdate(jobSetting); } - - if (axisPositionParams != null) - { - var axisPositionParamsByFormulaId = GetAxisPositionParamsByFormulaId(formulaId); - if (axisPositionParamsByFormulaId != null) - { - axisPositionParams.Id = axisPositionParamsByFormulaId.Id; - } - - Db.SaveOrUpdate(axisPositionParams); - } - - if (axisVariables != null) - { - var axisVariablesByFormulaId = GetAxisVariablesByFormulaId(formulaId); - if (axisVariablesByFormulaId != null) - { - axisVariables.Id = axisVariablesByFormulaId.Id; - } - - Db.SaveOrUpdate(axisVariables); - } } /// @@ -154,7 +130,7 @@ public class FormulaService return BeanUtil.CopyProperties(formulas); } - private static Formula GetFormulaByName(string name) + private static Formula? GetFormulaByName(string name) { return Db.Query("select * from formulas where name = ?", name).FirstOrDefault(); } @@ -173,9 +149,10 @@ public class FormulaService /// /// /// - private static FormulaDTO GetFormulaById(string id) + private static FormulaDTO? GetFormulaById(string id) { var formula = Db.GetById(id); + if (formula == null) return null; var dto = BeanUtil.CopyProperties(formula); dto.WorkBenchSetting = GetWorkBenchSettingByFormulaId(id) ?? new WorkBenchSetting(); dto.WaferSetting = GetWaferSettingByFormulaId(id) ?? new WaferSetting(); @@ -183,9 +160,7 @@ public class FormulaService dto.NeedleSetting = GetNeedleSettingByFormulaId(id) ?? new NeedleSetting(); dto.AltimetryParams = GetAltimetryParamsByFormulaId(id) ?? new AltimetryParams(); dto.JobSetting = GetJobSettingByFormulaId(id) ?? new JobSetting(); - dto.AxisPositionParams = GetAxisPositionParamsByFormulaId(id) ?? new AxisPositionParams(); dto.AlgorithmParams = GetAlgorithmParamsByFormulaId(id) ?? new AlgorithmParams(); - dto.AxisVariables = GetAxisVariablesByFormulaId(id) ?? new AxisVariables(); return dto; } @@ -218,18 +193,6 @@ public class FormulaService .FirstOrDefault(); } - private static AxisVariables? GetAxisVariablesByFormulaId(string formulaId) - { - return Db.Query("select * from axis_variables where formula_id = ?", formulaId) - .FirstOrDefault(); - } - - private static AxisPositionParams? GetAxisPositionParamsByFormulaId(string formulaId) - { - return Db.Query("select * from axis_position_params where formula_id = ?", formulaId) - .FirstOrDefault(); - } - private static AlgorithmParams? GetAlgorithmParamsByFormulaId(string formulaId) { return Db.Query("select * from algorithm_params where formula_id = ?", formulaId) diff --git a/MasstransferExporter/DataExporter/Model/AxisPositionParams.cs b/MasstransferExporter/DataExporter/Model/AxisPositionParams.cs index 0ff6ad1..12a5197 100644 --- a/MasstransferExporter/DataExporter/Model/AxisPositionParams.cs +++ b/MasstransferExporter/DataExporter/Model/AxisPositionParams.cs @@ -11,10 +11,6 @@ namespace MasstransferExporter.DataExporter.Model; [Table("axis_position_params"), Description("轴位置参数")] public class AxisPositionParams : Entity { - [Column("formula_id"), Description("配方Id"), Hide] - public string FormulaId { get; set; } - - [Column("wafer_y_manual_position"), Description("晶环龙门Y手动位置"), Property(Group = "WaferY", Variable = "stAxisArPos", Axis = 0, Index = 0)] public double WaferYManualPosition { get; set; } diff --git a/MasstransferExporter/DataExporter/Model/AxisVariables.cs b/MasstransferExporter/DataExporter/Model/AxisVariables.cs index 3a90efc..96984c1 100644 --- a/MasstransferExporter/DataExporter/Model/AxisVariables.cs +++ b/MasstransferExporter/DataExporter/Model/AxisVariables.cs @@ -11,9 +11,6 @@ namespace MasstransferExporter.DataExporter.Model; [Table("axis_variables"), Description("轴变量")] public class AxisVariables : Entity { - [Column("formula_id"), Description("配方Id"), Hide] - public string FormulaId { get; set; } - [Column("wafer_y_motor_left_soft_limit"), Description("晶圆Y轴左软限位"), Property(Group = "SoftLimit", Variable = "stAxisSoftLimit", Axis = 0, Index = 0)] public double WaferYMotorLeftSoftLimit { get; set; } diff --git a/MasstransferExporter/DataExporter/Model/FormulaDTO.cs b/MasstransferExporter/DataExporter/Model/FormulaDTO.cs index 1f9f740..63033ff 100644 --- a/MasstransferExporter/DataExporter/Model/FormulaDTO.cs +++ b/MasstransferExporter/DataExporter/Model/FormulaDTO.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using Newtonsoft.Json; namespace MasstransferExporter.DataExporter.Model; @@ -7,13 +8,17 @@ namespace MasstransferExporter.DataExporter.Model; /// public class FormulaDTO { - [Description("配方id")] public string Id { get; set; } + [Description("配方id"), JsonProperty("id")] + public string Id { get; set; } - [Description("配方名称")] public string Name { get; set; } + [Description("配方名称"), JsonProperty("name")] + public string Name { get; set; } - [Description("配方编号")] public string Code { get; set; } + [Description("配方编号"), JsonProperty("code")] + public string Code { get; set; } - [Description("配方描述")] public string Description { get; set; } + [Description("配方描述"), JsonProperty("description")] + public string Description { get; set; } [Description("是否启用")] public bool Selected { get; set; } @@ -28,9 +33,5 @@ public class FormulaDTO public AltimetryParams? AltimetryParams { get; set; } public JobSetting? JobSetting { get; set; } - public AxisVariables? AxisVariables { get; set; } - - public AxisPositionParams? AxisPositionParams { get; set; } - public AlgorithmParams? AlgorithmParams { get; set; } } \ No newline at end of file diff --git a/MasstransferExporter/DataExporter/Model/SystemParamsDTO.cs b/MasstransferExporter/DataExporter/Model/SystemParamsDTO.cs index c6677eb..bf419a3 100644 --- a/MasstransferExporter/DataExporter/Model/SystemParamsDTO.cs +++ b/MasstransferExporter/DataExporter/Model/SystemParamsDTO.cs @@ -20,4 +20,8 @@ public class SystemParamsDTO public MinioParams? MinioParams { get; set; } public MqttParams? MqttParams { get; set; } + + public AxisVariables? AxisVariables { get; set; } + + public AxisPositionParams? AxisPositionParams { get; set; } } \ No newline at end of file diff --git a/MasstransferExporter/DataExporter/SystemParamsService.cs b/MasstransferExporter/DataExporter/SystemParamsService.cs index 3e988d9..aa26a8e 100644 --- a/MasstransferExporter/DataExporter/SystemParamsService.cs +++ b/MasstransferExporter/DataExporter/SystemParamsService.cs @@ -17,7 +17,6 @@ public class SystemParamsService /// /// 处理下发的系统配置参数 /// - /// public static void HandleSystemParamsIssuedEvent(SystemParamsDTO dto) { if (dto.IsNullOrEmpty()) return; @@ -95,6 +94,30 @@ public class SystemParamsService Db.SaveOrUpdate(waferCameraInternalParams); } + if (dto?.AxisVariables != null) + { + var axisVariables = dto.AxisVariables; + var axisVariablesFromDb = GetAxisVariables(); + if (axisVariablesFromDb != null) + { + axisVariables.Id = axisVariablesFromDb.Id; + } + + Db.SaveOrUpdate(axisVariables); + } + + if (dto?.AxisPositionParams != null) + { + var axisPositionParams = dto.AxisPositionParams; + var axisPositionParamsFromDb = GetAxisPositionParams(); + if (axisPositionParamsFromDb != null) + { + axisPositionParams.Id = axisPositionParamsFromDb.Id; + } + + Db.SaveOrUpdate(axisPositionParams); + } + if (dto?.SubstrateCameraInternalParams == null) return; var substrateCameraInternalParams = dto.SubstrateCameraInternalParams; @@ -124,6 +147,8 @@ public class SystemParamsService MqttParams = GetMqttConnectParams(), ScannerParams = GetScannerParams(), SystemParams = GetSystemParams(), + AxisVariables = GetAxisVariables(), + AxisPositionParams = GetAxisPositionParams() }; var systemParams = new ConfigData() @@ -134,7 +159,6 @@ public class SystemParamsService }; await MessageQueueHelper.Publish(Topics.ReportConfigData, systemParams); - await MessageQueueHelper.Publish(Topics.ReportConfigData, systemParams); } catch (Exception e) { @@ -199,4 +223,16 @@ public class SystemParamsService return Db.Query("select * from mqtt_params limit 1") .FirstOrDefault(); } + + private static AxisVariables? GetAxisVariables() + { + return Db.Query("select * from axis_variables limit 1") + .FirstOrDefault(); + } + + private static AxisPositionParams? GetAxisPositionParams() + { + return Db.Query("select * from axis_position_params limit 1") + .FirstOrDefault(); + } } \ No newline at end of file diff --git a/MasstransferExporter/Jobs/CoordinateJob.cs b/MasstransferExporter/Jobs/CoordinateJob.cs new file mode 100644 index 0000000..ff3c188 --- /dev/null +++ b/MasstransferExporter/Jobs/CoordinateJob.cs @@ -0,0 +1,25 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.DataExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 坐标文件上报定时任务 +/// 每5分钟执行一次 +/// +[ScheduledJob("0 0/5 * * * ? ")] +public class CoordinateJob : IJob +{ + public void Execute() + { + try + { + CoordinateService.CoordinateExporter(); + } + catch (Exception e) + { + Log.Error(e, "坐标文件上传任务执行异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/FormulaJob.cs b/MasstransferExporter/Jobs/FormulaJob.cs new file mode 100644 index 0000000..9ba4cc7 --- /dev/null +++ b/MasstransferExporter/Jobs/FormulaJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.DataExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 配方上报任务 +/// +[ScheduledJob("0 15 2 ? * *")] +public class FormulaJob : IJob +{ + public async void Execute() + { + try + { + await FormulaService.FormulaDataExporter(); + } + catch (Exception e) + { + Log.Error(e, "配方上报任务异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/HeartbeatJob.cs b/MasstransferExporter/Jobs/HeartbeatJob.cs new file mode 100644 index 0000000..447c300 --- /dev/null +++ b/MasstransferExporter/Jobs/HeartbeatJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.StatExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 每 10 秒上报一次心跳 +/// +[ScheduledJob("0/10 * * * * ? *")] +public class HeartbeatJob : IJob +{ + public void Execute() + { + try + { + HeartbeatExporter.HeartBeat(); + } + catch (Exception e) + { + Log.Error(e, "心跳上报异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/ImageExportJob.cs b/MasstransferExporter/Jobs/ImageExportJob.cs new file mode 100644 index 0000000..1416427 --- /dev/null +++ b/MasstransferExporter/Jobs/ImageExportJob.cs @@ -0,0 +1,25 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.ImageExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 图片导出 +/// 每天凌晨1点30分开始执行 +/// +[ScheduledJob("0 30 1 ? * *")] +public class ImageExportJob : IJob +{ + public void Execute() + { + try + { + ImageService.ImageExporter(); + } + catch (Exception e) + { + Log.Error(e, "图片导出"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/Job.cs b/MasstransferExporter/Jobs/Job.cs new file mode 100644 index 0000000..d4250f6 --- /dev/null +++ b/MasstransferExporter/Jobs/Job.cs @@ -0,0 +1,9 @@ +namespace MasstransferExporter.Jobs; + +/// +/// 定时任务接口 +/// +public interface IJob +{ + void Execute(); +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/LogExportJob.cs b/MasstransferExporter/Jobs/LogExportJob.cs new file mode 100644 index 0000000..a30356a --- /dev/null +++ b/MasstransferExporter/Jobs/LogExportJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.LogExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 日志导出任务 +/// +[ScheduledJob("0 20 4 ? * *")] +public class LogExportJob : IJob +{ + public async void Execute() + { + try + { + await LogFileExporter.ExportLogFile(); + } + catch (Exception e) + { + Log.Error(e, "日志导出任务执行异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/OperationLogExportJob.cs b/MasstransferExporter/Jobs/OperationLogExportJob.cs new file mode 100644 index 0000000..f48fb9a --- /dev/null +++ b/MasstransferExporter/Jobs/OperationLogExportJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.LogExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 每天凌晨3 点15分上传用户操作日志 +/// +[ScheduledJob("0 15 3 ? * *")] +public class OperationLogExportJob : IJob +{ + public async void Execute() + { + try + { + await OperationLogExporter.ExportOperationLog(); + } + catch (Exception e) + { + Log.Error(e, "用户操作日志导出失败"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/StrikeRecordJob.cs b/MasstransferExporter/Jobs/StrikeRecordJob.cs new file mode 100644 index 0000000..58e8662 --- /dev/null +++ b/MasstransferExporter/Jobs/StrikeRecordJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.DataExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 动打作业定时任务 +/// +[ScheduledJob("0 0/5 * * * ?")] +public class StrikeRecordJob : IJob +{ + public async void Execute() + { + try + { + await StrikeRecordService.ReportStrikeRecord(); + } + catch (Exception e) + { + Log.Error(e, "动打作业定时任务异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/SystemParamJob.cs b/MasstransferExporter/Jobs/SystemParamJob.cs new file mode 100644 index 0000000..be202ec --- /dev/null +++ b/MasstransferExporter/Jobs/SystemParamJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.DataExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 每天凌晨3点30分上传系统参数 +/// +[ScheduledJob("0 30 3 ? * *")] +public class SystemParamJob : IJob +{ + public async void Execute() + { + try + { + await SystemParamsService.ExportSystemParams(); + } + catch (Exception e) + { + Log.Error(e, "系统参数上报定时任务执行异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Jobs/SystemStatExportJob.cs b/MasstransferExporter/Jobs/SystemStatExportJob.cs new file mode 100644 index 0000000..3547ad3 --- /dev/null +++ b/MasstransferExporter/Jobs/SystemStatExportJob.cs @@ -0,0 +1,24 @@ +using MasstransferCommon.Annotation; +using MasstransferExporter.StatExporter; +using Serilog; + +namespace MasstransferExporter.Jobs; + +/// +/// 每30秒导出一次系统状态 +/// +[ScheduledJob("0/30 * * * * ? *")] +public class SystemStatExportJob : IJob +{ + public async void Execute() + { + try + { + await SystemStatExporter.ExportSystemStat(); + } + catch (Exception e) + { + Log.Error(e, "系统状态导出异常"); + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/Program.cs b/MasstransferExporter/Program.cs index 4ce3518..9d8bbf8 100644 --- a/MasstransferExporter/Program.cs +++ b/MasstransferExporter/Program.cs @@ -1,15 +1,10 @@ using MasstransferCommon.Config; using MasstransferCommon.Events; using MasstransferCommon.Scheduler; -using MasstransferCommunicate.Mqtt.Client; using MasstransferCommunicate.Process.Client; -using MasstransferExporter.DataExporter; using MasstransferExporter.Init; -using MasstransferExporter.StatExporter; using MasstransferInfrastructure.Database.Sqlite; -using MasstransferInfrastructure.Mqtt.Model; using Serilog; -using MqttParams = MasstransferCommon.Model.Entity.MqttParams; namespace MasstransferExporter; @@ -19,39 +14,35 @@ class Program public static async Task Main() { - Log.Logger = LogConfiguration.GetLogger(); - - // 进行初始化调用 - InstantUtil.Init(); - - var mqttParams = Db.Query("select * from mqtt_params").FirstOrDefault(); - - // 启动mqtt连接 - await MessageQueueHelper.InitConnect(new MqttConnectOptions() + try { - ServerAddress = mqttParams.ServerAddress, - Port = mqttParams.Port, - UserName = mqttParams.UserName, - Password = mqttParams.Password - }); + Log.Logger = LogConfiguration.GetLogger(); - Thread.Sleep(3000); + // 进行初始化调用 + InstantUtil.Init(); - // 启动完成后，广播启动通知 - EventBus.Publish(EventType.StartUp, true); + // 启动与主程序的通信 + ProcessHelper.Init(); - DelayScheduler.Delay(async () => await SystemParamsService.ExportSystemParams(), - TimeSpan.FromSeconds(3)); + Thread.Sleep(3000); + // 启动完成后，广播启动通知 + EventBus.Publish(EventType.StartUp, true); - // 启动与主程序的通信 - // ProcessHelper.Init(); + // 启动定时任务 + await QuartzScheduler.Instance.StartAsync(); - // SystemStatExporter.Collect(); - - - Console.WriteLine("按任意键退出"); - - Console.ReadKey(); + Console.WriteLine("按任意键退出"); + Console.ReadKey(); + } + catch (Exception e) + { + Console.WriteLine(e); + } + finally + { + // 停止定时任务 + await QuartzScheduler.Instance.StopAsync(); + } } } \ No newline at end of file diff --git a/MasstransferExporter/StatExporter/HeartbeatExporter.cs b/MasstransferExporter/StatExporter/HeartbeatExporter.cs index a23f4de..9290c31 100644 --- a/MasstransferExporter/StatExporter/HeartbeatExporter.cs +++ b/MasstransferExporter/StatExporter/HeartbeatExporter.cs @@ -1,22 +1,14 @@ using MasstransferCommon.Model.Constant; -using MasstransferCommon.Scheduler; using MasstransferCommunicate.Mqtt.Client; -namespace MasstransferExporter.Stat; +namespace MasstransferExporter.StatExporter; /// /// 心跳 /// public class HeartbeatExporter { - /// - /// 启动心跳线程 - /// - public static void StartHeartBeat() - { - JobScheduler.AddTask("HeartbeatExporter#StartHeartBeat", HeartBeat, 10000); - } - + public static async void HeartBeat() { var data = new Dictionary(); diff --git a/MasstransferInfrastructure/Database/Sqlite/SqliteHelper.cs b/MasstransferInfrastructure/Database/Sqlite/SqliteHelper.cs index fa7361b..1946a07 100644 --- a/MasstransferInfrastructure/Database/Sqlite/SqliteHelper.cs +++ b/MasstransferInfrastructure/Database/Sqlite/SqliteHelper.cs @@ -110,7 +110,7 @@ public class SqliteHelper /// /// 数据ID /// 数据类型 - public T GetById(object id) where T : new() + public T? GetById(object id) where T : new() { return _db.Get(id); } diff --git a/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs b/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs index 7a50a99..faf4f58 100644 --- a/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs +++ b/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs @@ -1,5 +1,4 @@ -using System.Reflection; -using MasstransferCommon.Model.Entity; +using MasstransferCommon.Model.Entity; using MasstransferCommon.Utils; using MasstransferCommunicate.Mqtt.Model; using MasstransferInfrastructure.Database.Sqlite; @@ -8,7 +7,6 @@ using MQTTnet; using MQTTnet.Client; using MQTTnet.Protocol; using Serilog; -using MqttClient = MasstransferCommunicate.Mqtt.Client.MqttClient; namespace MasstransferCommunicate.Mqtt.Client; @@ -20,15 +18,26 @@ public class MessageQueueHelper private static readonly MqttClient Client = new(); + private static readonly SqliteHelper Db = SqliteHelper.GetInstance(); /// /// 初始化连接 /// - /// - public static async Task InitConnect(MqttConnectOptions options) + public static async Task InitConnect() { try { + var mqttParams = Db.Query("select * from mqtt_params").FirstOrDefault(); + + // 启动mqtt连接 + var options = new MqttConnectOptions() + { + ServerAddress = mqttParams!.ServerAddress, + Port = mqttParams.Port, + UserName = mqttParams.UserName, + Password = mqttParams.Password + }; + if (!await Client.ConnectAsync(options)) return false; // 连接成功后监听消息 Client.MessageReceived += HandleMessageReceived;