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(); 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); } } }