From 752e89a0bbbfb64ad117941ee1224c8598b1e80f Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Fri, 4 Jul 2025 09:34:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E9=A3=9E=E8=A1=8C=E5=99=A8?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=9C=BA=E5=9C=BA=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs   |  4 ++--
 OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs |  4 ++--
 OpenAuth.WebApi/Model/mqtt/ThingStatusHandler.cs  | 11 ++++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs b/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
index e3dd528..e0c2955 100644
--- a/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
+++ b/OpenAuth.WebApi/Model/mqtt/MqttHostedService.cs
@@ -40,11 +40,11 @@ namespace OpenAuth.WebApi.Model.mqtt
                 {
                     $"thing/product/{gateway}/osd",
                     $"thing/product/{gateway}/events",
-                    $"thing/product/{gateway}/requests1",
+                    $"thing/product/{gateway}/requests",
                     $"thing/product/{gateway}/services_reply",
                     //$"thing/product/{gateway}/drc/up",
                     //$"thing/product/{gateway}/drc/down",
-                    $"thing/product/{gateway}/status"
+                    $"sys/product/{gateway}/status"
                 });
             }
             await _mqttCenter.ConnectAndSubscribeAsync(topics.ToArray());
diff --git a/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs b/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
index 28f05e1..27d5a7f 100644
--- a/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
+++ b/OpenAuth.WebApi/Model/mqtt/ThingRequestHandler.cs
@@ -183,8 +183,8 @@ namespace OpenAuth.WebApi.Model.mqtt
                 var topics = new List<string>();
                 topics.AddRange(new[]
                 {
-                    $"thing/product/{dronesn}/osd",
-                    $"thing/product/{uavsn}/osd", 
+                    $"sys/product/{dronesn}/osd",
+                    $"sys/product/{uavsn}/osd", 
                 });
                 await _mqttCenter.SubscribeAsync(topics.ToArray());
                 var requestData = new
diff --git a/OpenAuth.WebApi/Model/mqtt/ThingStatusHandler.cs b/OpenAuth.WebApi/Model/mqtt/ThingStatusHandler.cs
index f113fa0..3ba6d8f 100644
--- a/OpenAuth.WebApi/Model/mqtt/ThingStatusHandler.cs
+++ b/OpenAuth.WebApi/Model/mqtt/ThingStatusHandler.cs
@@ -22,7 +22,7 @@ namespace OpenAuth.WebApi.Model.mqtt
         {
             return topic.Contains("/status");
         }
-        string bid, tid, previousgateway;
+
         public async Task HandleAsync(string topic, string payload)
         {
             _logger.LogError($"[Service] Topic={topic}, Payload={payload}");
@@ -35,8 +35,9 @@ namespace OpenAuth.WebApi.Model.mqtt
                 {
                     return;
                 }
-                bid = root["bid"]?.ToString() ?? "";
-                tid = root["tid"]?.ToString() ?? "";
+                var bid = root["bid"]?.ToString() ?? "";
+                var tid = root["tid"]?.ToString() ?? "";
+                var timestamp = long.Parse(root["timestamp"]?.ToString() ?? "0");
                 var requestData = new
                 {
                     bid = bid,
@@ -45,12 +46,12 @@ namespace OpenAuth.WebApi.Model.mqtt
                     timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                     data = new
                     {
-                        result = 0, 
+                        result = 0,
                     }
                 };
                 string getway = topic.Split('/')[2];
                 string payloadreq = JsonSerializer.Serialize(requestData);
-                await _mqttClientManager.PublishAsync($"thing/product/{getway}/status_reply", payloadreq);
+                await _mqttClientManager.PublishAsync($"sys/product/{getway}/status_reply", payloadreq);
             }
         }
     }