From c5b12fa559f246af384377b13fe6ab4bb9fee587 Mon Sep 17 00:00:00 2001 From: huangxianguo Date: Thu, 5 Sep 2024 19:41:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmqtt=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MasstransferCommon/Model/Constant/Topics.cs | 2 +- MasstransferCommon/Service/Instant.cs | 9 +++++ MasstransferCommon/Utils/JsonUtil.cs | 13 +++++--- .../DataExporter/ConfigService.cs | 17 +++++----- .../DataExporter/CoordinateService.cs | 9 +++-- .../ImageExporter/ImageService.cs | 15 +++++---- MasstransferExporter/Init/InstantUtil.cs | 33 +++++++++++++++++++ .../License/LicenseService.cs | 17 +++++----- .../OTA/Service/OTAService.cs | 23 ++++++------- MasstransferExporter/Program.cs | 14 ++++++-- .../RemoteControl/Model/LockCmd.cs | 7 +++- .../RemoteControl/RemoteLockService.cs | 18 +++++----- .../Mqtt/Client/MessageQueueHelper.cs | 8 +++-- .../Mqtt/Client/MqttClient.cs | 3 +- .../Mqtt/Model/Message.cs | 8 +++-- .../Mqtt/Model/Payload.cs | 12 ++++--- 16 files changed, 144 insertions(+), 64 deletions(-) create mode 100644 MasstransferCommon/Service/Instant.cs create mode 100644 MasstransferExporter/Init/InstantUtil.cs diff --git a/MasstransferCommon/Model/Constant/Topics.cs b/MasstransferCommon/Model/Constant/Topics.cs index f14fc5b..b7388c2 100644 --- a/MasstransferCommon/Model/Constant/Topics.cs +++ b/MasstransferCommon/Model/Constant/Topics.cs @@ -9,7 +9,7 @@ public static class Topics { // ReSharper disable once InconsistentNaming - private const string SN = "5506771257"; + private const string SN = "G5506771257"; private const string Version = "1.0.0"; diff --git a/MasstransferCommon/Service/Instant.cs b/MasstransferCommon/Service/Instant.cs new file mode 100644 index 0000000..c906ef9 --- /dev/null +++ b/MasstransferCommon/Service/Instant.cs @@ -0,0 +1,9 @@ +namespace MasstransferCommon.Atrributes; + +public interface Instant +{ + /// + /// 初始化对象后进行回调 + /// + void Initialized(); +} \ No newline at end of file diff --git a/MasstransferCommon/Utils/JsonUtil.cs b/MasstransferCommon/Utils/JsonUtil.cs index 945d980..71e4cd6 100644 --- a/MasstransferCommon/Utils/JsonUtil.cs +++ b/MasstransferCommon/Utils/JsonUtil.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using System.Text.Json; +using Newtonsoft.Json; namespace MasstransferCommon.Utils; @@ -28,11 +29,15 @@ public class JsonUtil } } - public static T FromJson(string json) + public static T? FromJson(string json) { try { - return JsonConvert.DeserializeObject(json); + var settings = new JsonSerializerSettings + { + NullValueHandling = NullValueHandling.Ignore + }; + return JsonConvert.DeserializeObject(json, settings); } catch (Exception e) { @@ -52,7 +57,7 @@ public class JsonUtil } } - public static T FromJsonOrDefault(string json) + public static T? FromJsonOrDefault(string json) { try { diff --git a/MasstransferExporter/DataExporter/ConfigService.cs b/MasstransferExporter/DataExporter/ConfigService.cs index 17239b8..045bf30 100644 --- a/MasstransferExporter/DataExporter/ConfigService.cs +++ b/MasstransferExporter/DataExporter/ConfigService.cs @@ -1,4 +1,5 @@ -using MasstransferCommon.Events; +using MasstransferCommon.Atrributes; +using MasstransferCommon.Events; using MasstransferCommon.Model.Constant; using MasstransferCommon.Utils; using MasstransferCommunicate.Mqtt.Client; @@ -10,17 +11,12 @@ namespace MasstransferExporter.DataExporter; /// /// 配置服务 /// -public class ConfigService +public class ConfigService : Instant { - static ConfigService() - { - EventBus.AddEventHandler(EventType.StartUp, async () => { await ListenConfigIssuedEvent(); }); - } - /// /// 监听配置下发事件 /// - public static async Task ListenConfigIssuedEvent() + private static async Task ListenConfigIssuedEvent(EventType type, bool start) { await MessageQueueHelper.Subscribe(Topics.DownloadConfigData, HandleConfigIssuedEvent); } @@ -54,4 +50,9 @@ public class ConfigService } } } + + public void Initialized() + { + EventBus.AddEventHandler(EventType.StartUp, ListenConfigIssuedEvent); + } } \ No newline at end of file diff --git a/MasstransferExporter/DataExporter/CoordinateService.cs b/MasstransferExporter/DataExporter/CoordinateService.cs index 2715ccc..1c7d6ee 100644 --- a/MasstransferExporter/DataExporter/CoordinateService.cs +++ b/MasstransferExporter/DataExporter/CoordinateService.cs @@ -1,4 +1,5 @@ -using MasstransferCommon.Model.Constant; +using MasstransferCommon.Atrributes; +using MasstransferCommon.Model.Constant; using MasstransferCommon.Utils; using MasstransferCommunicate.Minio; using MasstransferCommunicate.Mqtt.Client; @@ -10,7 +11,7 @@ namespace MasstransferExporter.DataExporter; /// /// 坐标信息业务类 /// -public class CoordinateService +public class CoordinateService : Instant { private static readonly SqliteHelper Db = SqliteHelper.GetInstance(); @@ -111,4 +112,8 @@ public class CoordinateService }; await MessageQueueHelper.Publish(Topics.CoordinateUpload, data); } + + public void Initialized() + { + } } \ No newline at end of file diff --git a/MasstransferExporter/ImageExporter/ImageService.cs b/MasstransferExporter/ImageExporter/ImageService.cs index 92cceb7..3cab2e0 100644 --- a/MasstransferExporter/ImageExporter/ImageService.cs +++ b/MasstransferExporter/ImageExporter/ImageService.cs @@ -1,4 +1,5 @@ using System.Drawing; +using MasstransferCommon.Atrributes; using MasstransferCommon.Events; using MasstransferCommon.Model.Constant; using MasstransferCommon.Utils; @@ -10,7 +11,7 @@ using MasstransferInfrastructure.Database.Sqlite; namespace MasstransferExporter.ImageExporter; -public class ImageService +public class ImageService : Instant { private static readonly MinioHelper Minio = MinioHelper.GetInstance(); @@ -19,15 +20,10 @@ public class ImageService private const string BasePath = "masstransfer"; - static ImageService() - { - EventBus.AddEventHandler(EventType.StartUp, async () => { await ListenImageQueryEvent(); }); - } - /// /// 监听图片查询事件 /// - public static async Task ListenImageQueryEvent() + private static async Task ListenImageQueryEvent(EventType type, bool start) { await MessageQueueHelper.Subscribe(Topics.UpdateLicenseEvent, HandleImageQueryEvent); } @@ -265,4 +261,9 @@ public class ImageService Console.WriteLine($"图片导出失败,{e}"); } } + + public void Initialized() + { + EventBus.AddEventHandler(EventType.StartUp, ListenImageQueryEvent); + } } \ No newline at end of file diff --git a/MasstransferExporter/Init/InstantUtil.cs b/MasstransferExporter/Init/InstantUtil.cs new file mode 100644 index 0000000..401440e --- /dev/null +++ b/MasstransferExporter/Init/InstantUtil.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using MasstransferCommon.Atrributes; + +namespace MasstransferExporter.Init; + +public class InstantUtil +{ + /// + /// 启动是对象的初始化 + /// + public static void Init() + { + // 获取当前程序集 + var currentAssembly = Assembly.GetExecutingAssembly(); + + // 获取所有类型 + var types = currentAssembly.GetTypes(); + + // 找到实现了 Instant 接口的类型 + var instantImplementations = + types.Where(t => typeof(Instant).IsAssignableFrom(t) && t is { IsInterface: false, IsAbstract: false }); + + foreach (var type in instantImplementations) + { + // 创建实例 + if (Activator.CreateInstance(type) is Instant instance) + { + // 调用 Initialized 方法 + instance.Initialized(); + } + } + } +} \ No newline at end of file diff --git a/MasstransferExporter/License/LicenseService.cs b/MasstransferExporter/License/LicenseService.cs index 9d5ccf6..e129941 100644 --- a/MasstransferExporter/License/LicenseService.cs +++ b/MasstransferExporter/License/LicenseService.cs @@ -1,4 +1,5 @@ -using MasstransferCommon.Events; +using MasstransferCommon.Atrributes; +using MasstransferCommon.Events; using MasstransferCommon.Model.Constant; using MasstransferCommunicate.Mqtt.Client; using MasstransferCommunicate.Process.Client; @@ -8,17 +9,12 @@ namespace MasstransferExporter.License; /// /// 证书业务 /// -public class LicenseService +public class LicenseService : Instant { - static LicenseService() - { - EventBus.AddEventHandler(EventType.StartUp, async () => { await ListenLicenseUpdateEvent(); }); - } - /// /// 启动监听证书更新事件 /// - public static async Task ListenLicenseUpdateEvent() + private static async Task ListenLicenseUpdateEvent(EventType type, bool start) { await MessageQueueHelper.Subscribe(Topics.UpdateLicenseEvent, HandleUpdateLicenseEvent); } @@ -42,4 +38,9 @@ public class LicenseService { await MessageQueueHelper.Publish(Topics.UpdateLicenseEventFeedback, result); } + + public void Initialized() + { + EventBus.AddEventHandler(EventType.StartUp, ListenLicenseUpdateEvent); + } } \ No newline at end of file diff --git a/MasstransferExporter/OTA/Service/OTAService.cs b/MasstransferExporter/OTA/Service/OTAService.cs index 1deb1b9..030ee7d 100644 --- a/MasstransferExporter/OTA/Service/OTAService.cs +++ b/MasstransferExporter/OTA/Service/OTAService.cs @@ -1,4 +1,5 @@ -using MasstransferCommon.Events; +using MasstransferCommon.Atrributes; +using MasstransferCommon.Events; using MasstransferCommon.Model.Constant; using MasstransferCommon.Utils; using MasstransferCommunicate.Mqtt.Client; @@ -9,20 +10,15 @@ using MasstransferInfrastructure.Database.Sqlite; namespace MasstransferExporter.OTA.Service; -public class OTAService +public class OTAService : Instant { private static readonly SqliteHelper Db = SqliteHelper.GetInstance(); private static OTAUpdateFileManager _otaUpdateFileManager; - static OTAService() - { - EventBus.AddEventHandler(EventType.StartUp, async () => { await StartOTAService(); }); - } - /// /// 启动OTA服务 /// - private static async Task StartOTAService() + private static async Task StartOTAService(EventType type, bool start) { _otaUpdateFileManager = GetOTAUpdateFileManager(); @@ -116,7 +112,7 @@ public class OTAService try { //初始化 - initDir(criticalBackupDir); + InitDir(criticalBackupDir); //备份重要文件 OTAClient.BackupEssentialFiles(appDir, criticalBackupDir, criticalFileExtension, criticalSourceLogPath); @@ -167,7 +163,7 @@ public class OTAService /// /// 初始化重要文件备份目录 /// - private static void initDir(string criticalBackupDir) + private static void InitDir(string criticalBackupDir) { if (Directory.Exists(criticalBackupDir)) { @@ -185,7 +181,7 @@ public class OTAService { //删除安装过程中创建的文件、目录 var directoryList = new string[] { appDir, criticalBackupDir }; - var filePath = new String[] { updatePackagePath }; + var filePath = new string[] { updatePackagePath }; foreach (var directory in directoryList) { @@ -209,4 +205,9 @@ public class OTAService //删除旧版本备份 OTAClient.DeleteFile(previousBackupPath); } + + public void Initialized() + { + EventBus.AddEventHandler(EventType.StartUp, StartOTAService); + } } \ No newline at end of file diff --git a/MasstransferExporter/Program.cs b/MasstransferExporter/Program.cs index 2754122..caa5d92 100644 --- a/MasstransferExporter/Program.cs +++ b/MasstransferExporter/Program.cs @@ -1,7 +1,11 @@ using MasstransferCommon.Events; using MasstransferCommon.Model.Entity; +using MasstransferCommon.Utils; using MasstransferCommunicate.Mqtt.Client; +using MasstransferCommunicate.Mqtt.Model; using MasstransferCommunicate.Process.Client; +using MasstransferExporter.Init; +using MasstransferExporter.RemoteControl.Model; using MasstransferInfrastructure.Database.Sqlite; using MasstransferInfrastructure.Mqtt.Model; @@ -13,6 +17,9 @@ class Program public static async Task Main() { + // 进行初始化调用 + InstantUtil.Init(); + var mqttParams = Db.Query("select * from mqtt_params").FirstOrDefault(); // 启动mqtt连接 @@ -24,14 +31,17 @@ class Program Password = mqttParams.Password }); - // 启动与主程序的通信 - ProcessHelper.Init(); + Thread.Sleep(3000); // 启动完成后，广播启动通知 EventBus.Publish(EventType.StartUp, true); + // 启动与主程序的通信 + // ProcessHelper.Init(); + Console.WriteLine("按任意键退出"); + Console.ReadKey(); } } \ No newline at end of file diff --git a/MasstransferExporter/RemoteControl/Model/LockCmd.cs b/MasstransferExporter/RemoteControl/Model/LockCmd.cs index cc19b23..187324f 100644 --- a/MasstransferExporter/RemoteControl/Model/LockCmd.cs +++ b/MasstransferExporter/RemoteControl/Model/LockCmd.cs @@ -1,4 +1,6 @@ -namespace MasstransferExporter.RemoteControl.Model; +using Newtonsoft.Json; + +namespace MasstransferExporter.RemoteControl.Model; /// /// 锁机指令 @@ -8,16 +10,19 @@ public class LockCmd /// /// 0 锁机 1 解锁 /// + [JsonProperty("action")] public int Action { get; set; } /// /// 0 立即执行 /// 1 到期执行 /// + [JsonProperty("lockType")] public int LockType { get; set; } /// /// 到期时间 /// + [JsonProperty("expiryTime")] public long ExpiryTime { get; set; } } \ No newline at end of file diff --git a/MasstransferExporter/RemoteControl/RemoteLockService.cs b/MasstransferExporter/RemoteControl/RemoteLockService.cs index 048f3e9..0c9e710 100644 --- a/MasstransferExporter/RemoteControl/RemoteLockService.cs +++ b/MasstransferExporter/RemoteControl/RemoteLockService.cs @@ -1,4 +1,5 @@ -using MasstransferCommon.Events; +using MasstransferCommon.Atrributes; +using MasstransferCommon.Events; using MasstransferCommon.Model.Constant; using MasstransferCommon.Model.Enum; using MasstransferCommon.Utils; @@ -11,20 +12,14 @@ namespace MasstransferExporter.RemoteControl; /// /// 远程锁定服务 /// -public class RemoteLockService +public class RemoteLockService : Instant { private const string KeyPath = @"Software\Masstransfer\Security"; - - static RemoteLockService() - { - EventBus.AddEventHandler(EventType.StartUp, async () => { await ListenRemoteLockEvent(); }); - } - /// /// 监听远程锁机事件 /// - public static async Task ListenRemoteLockEvent() + private static async Task ListenRemoteLockEvent(EventType type, bool start) { await MessageQueueHelper.Subscribe(Topics.RemoteControl, HandleLockCmd); } @@ -75,4 +70,9 @@ public class RemoteLockService } } } + + public void Initialized() + { + EventBus.AddEventHandler(EventType.StartUp, ListenRemoteLockEvent); + } } \ No newline at end of file diff --git a/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs b/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs index f2aecdd..3517467 100644 --- a/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs +++ b/MasstransferInfrastructure/Mqtt/Client/MessageQueueHelper.cs @@ -1,5 +1,6 @@ using MasstransferCommon.Model.Entity; using MasstransferCommon.Utils; +using MasstransferCommunicate.Mqtt.Model; using MasstransferInfrastructure.Database.Sqlite; using MasstransferInfrastructure.Mqtt.Model; using MQTTnet; @@ -113,9 +114,12 @@ public class MessageQueueHelper var methodInfo = subscriber.Method; var parameters = methodInfo.GetParameters(); if (parameters.Length != 2) continue; - var type = parameters[1].ParameterType; + var payload = JsonUtil.FromJson>(message); + + if (payload == null) continue; + // 通知订阅者 - subscriber.DynamicInvoke(topic, JsonUtil.FromJson(type, message)); + subscriber.DynamicInvoke(topic, JsonUtil.ToJson(payload.Data)); } catch (Exception exception) { diff --git a/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs b/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs index 1c3f69e..6113c46 100644 --- a/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs +++ b/MasstransferInfrastructure/Mqtt/Client/MqttClient.cs @@ -1,4 +1,5 @@ using System.Security.Cryptography.X509Certificates; +using MasstransferCommon.Model.Constant; using MasstransferCommon.Utils; using MasstransferInfrastructure.Mqtt.Model; using MasstransferSecurity.Utils; @@ -33,7 +34,7 @@ class MqttClient return new MqttClientOptionsBuilder() .WithTcpServer(options.ServerAddress, options.Port) // .WithCredentials(options.UserName, options.Password) - .WithClientId(clientId) + .WithClientId(Constants.SN) .WithCleanSession() .WithTlsOptions( o => diff --git a/MasstransferInfrastructure/Mqtt/Model/Message.cs b/MasstransferInfrastructure/Mqtt/Model/Message.cs index 873f474..fd3fe55 100644 --- a/MasstransferInfrastructure/Mqtt/Model/Message.cs +++ b/MasstransferInfrastructure/Mqtt/Model/Message.cs @@ -1,8 +1,10 @@ -namespace MasstransferInfrastructure.Mqtt.Model; +using MasstransferCommunicate.Mqtt.Model; -public class Message +namespace MasstransferInfrastructure.Mqtt.Model; + +public class Message { public string Topic { get; set; } - public Payload Payload { get; set; } + public Payload Payload { get; set; } } \ No newline at end of file diff --git a/MasstransferInfrastructure/Mqtt/Model/Payload.cs b/MasstransferInfrastructure/Mqtt/Model/Payload.cs index a2e3c2c..55e31b5 100644 --- a/MasstransferInfrastructure/Mqtt/Model/Payload.cs +++ b/MasstransferInfrastructure/Mqtt/Model/Payload.cs @@ -1,10 +1,12 @@ -namespace MasstransferInfrastructure.Mqtt.Model; +using Newtonsoft.Json; -public class Payload +namespace MasstransferCommunicate.Mqtt.Model; + +public class Payload { - public string MsgId { get; set; } + [JsonProperty("msgId")] public string MsgId { get; set; } - public DateTime ConsumeTime { get; set; } + [JsonProperty("consumeTime")] public string ConsumeTime { get; set; } - public object Data { get; set; } + [JsonProperty("data")] public T Data { get; set; } } \ No newline at end of file