From b3f3c79f70259e1b90634aea74764dbd610291d4 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Mon, 23 Jun 2025 17:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=A0=E4=BA=BA=E6=9C=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Repository/Domain/LasaUav.cs         |  1 +
 .../Model/mqtt/MqttHostedService.cs           |  3 +-
 .../Model/mqtt/ThingRequestHandler.cs         |  2 +-
 .../Model/mqtt/ThingStateHandler.cs           | 39 +++++++++++++++++++
 OpenAuth.WebApi/Startup.cs                    | 31 +++++++--------
 5 files changed, 58 insertions(+), 18 deletions(-)
 create mode 100644 OpenAuth.WebApi/Model/mqtt/ThingStateHandler.cs

diff --git a/OpenAuth.Repository/Domain/LasaUav.cs b/OpenAuth.Repository/Domain/LasaUav.cs
index 03a4be2..b56118c 100644
--- a/OpenAuth.Repository/Domain/LasaUav.cs
+++ b/OpenAuth.Repository/Domain/LasaUav.cs
@@ -29,5 +29,6 @@ namespace OpenAuth.Repository.Domain
         /// </summary>           
         [SugarColumn(DefaultValue = "false")]
         public bool IsDelete { get; set; }
+        public string WorkSpaceId { get; set; }
     }
 }
diff --git a/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs b/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
index 0688d3e..97e14d0 100644
--- a/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
+++ b/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
@@ -41,7 +41,8 @@ namespace OpenAuth.WebApi.Model.mqtt
                     $"thing/product/{gateway}/osd", 
                     $"thing/product/{gateway}/events",
                     $"thing/product/{gateway}/requests",
-                    $"thing/product/{gateway}/services_reply"
+                    $"thing/product/{gateway}/services_reply",
+                    $"thing/product/{gateway}/state"
                 });
             }
             await _mqttCenter.ConnectAndSubscribeAsync(topics.ToArray());
diff --git a/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs b/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
index 8056764..1b2dd50 100644
--- a/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
+++ b/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
@@ -85,7 +85,7 @@ namespace OpenAuth.WebApi.Model.mqtt
                 {
                     device_callsign = "山东慧创",
                     is_device_bind_organization = true,
-                    organization_id = "379",
+                    organization_id = "371300",
                     organization_name = "山东慧创",
                     sn = sn
                 }).ToArray();
diff --git a/OpenAuth.WebApi/Model/mqtt/ThingStateHandler.cs b/OpenAuth.WebApi/Model/mqtt/ThingStateHandler.cs
new file mode 100644
index 0000000..99a5ac8
--- /dev/null
+++ b/OpenAuth.WebApi/Model/mqtt/ThingStateHandler.cs
@@ -0,0 +1,39 @@
+using Infrastructure.CloudSdk.mqttmessagecenter;
+using OpenAuth.App.ServiceApp;
+using OpenAuth.Repository.Domain;
+using System.Text.Json.Nodes;
+
+namespace OpenAuth.WebApi.Model.mqtt
+{
+    public class ThingStateHandler : IMqttMessageHandler
+    {
+        private readonly ILogger<ThingStateHandler> _logger;
+        AirportMaintenanceApp _app;
+        public ThingStateHandler(ILogger<ThingStateHandler> logger, AirportMaintenanceApp app)
+        {
+            _logger = logger;
+            _app = app;
+        }
+
+        public bool CanHandle(string topic)
+        {
+            return topic.Contains("/state");
+        }
+
+        public Task HandleAsync(string topic, string payload)
+        {
+            _logger.LogError($"[Service] Topic={topic}, Payload={payload}");
+            Console.WriteLine($"[Service] Topic={topic}, Payload={payload}");
+            var root = JsonNode.Parse(payload)?.AsObject();
+            _app.AddLog(new LasaLog
+            {
+                Id = Guid.NewGuid().ToString(),
+                Topic = topic,
+                Method = root["method"]?.ToString() ?? "",
+                CreateTime = DateTime.Now,
+                Data = root
+            });
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/OpenAuth.WebApi/Startup.cs b/OpenAuth.WebApi/Startup.cs
index 14215f3..6937acb 100644
--- a/OpenAuth.WebApi/Startup.cs
+++ b/OpenAuth.WebApi/Startup.cs
@@ -254,16 +254,16 @@ namespace OpenAuth.WebApi
                 StaticConfig.CustomSnowFlakeFunc = () => { return YitIdHelper.NextId(); };
 
                 var sqlSugar = new SqlSugarClient(new ConnectionConfig()
+                {
+                    DbType = DbType.PostgreSQL,
+                    ConnectionString = Configuration.GetConnectionString("OpenAuthDBContext"),
+                    IsAutoCloseConnection = true,
+                    MoreSettings = new ConnMoreSettings()
                     {
-                        DbType = DbType.PostgreSQL,
-                        ConnectionString = Configuration.GetConnectionString("OpenAuthDBContext"),
-                        IsAutoCloseConnection = true,
-                        MoreSettings = new ConnMoreSettings()
-                        {
-                            PgSqlIsAutoToLower = false,
-                            PgSqlIsAutoToLowerCodeFirst = false
-                        }
-                    },
+                        PgSqlIsAutoToLower = false,
+                        PgSqlIsAutoToLowerCodeFirst = false
+                    }
+                },
 
                     //var sqlSugar = new SqlSugarClient(new ConnectionConfig()
                     //{
@@ -316,7 +316,7 @@ namespace OpenAuth.WebApi
 
             #region Quartz
             services.AddHostedService<QuartzService>();
-            
+
             #endregion
 
             #region SignalR
@@ -327,14 +327,13 @@ namespace OpenAuth.WebApi
 
             #region mqtt
             services.AddSingleton<MqttMessageCenter>();
-            //services.AddSingleton<IMqttMessageHandler, ThingRequestHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingRequestHandler>();
             services.AddSingleton<IMqttMessageHandler, ThingServiceHandler>();
-            //services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
-            //services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
-            
+            services.AddSingleton<IMqttMessageHandler, ThingOsdHandler>();
+            services.AddSingleton<IMqttMessageHandler, ThingEventHandler>();
             services.AddHostedService<MqttHostedService>();
-             
-            
+
+
 
             #endregion
         }