From ce750bb8d12d6b7f50574a68ffa5e8d17d6b173b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E4=BC=9F?= <421281095@qq.com> Date: Thu, 11 Sep 2025 17:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceApp/Subscribe/ConfigSubscribe.cs | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs b/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs index a5ec9b2..d7d7099 100644 --- a/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs +++ b/OpenAuth.App/ServiceApp/Subscribe/ConfigSubscribe.cs @@ -83,19 +83,7 @@ public class ConfigSubscribe : IJob private async Task HandleTopic(MqttApplicationMessageReceivedEventArgs args, string topic, string message) { - /* - thing/product/{device_sn}/osd 设备端定频向云平台推送的设备属性(properties), - 具体内容范围参见物模型内容 - thing/product/{device_sn}/state 设备端按需上报向云平台推送的设备属性(properties), - 具体内容范围参见物模型内容 - thing/product/{gateway_sn}/services_reply 设备对 service 的回复、处理结果 (航线任务下发之类的) - thing/product/{gateway_sn}/events 设备端向云平台发送的,需要关注和处理的事件。 - 比如SD满了,飞机解禁禁飞区等信息(事件范围参见物模型内容) - thing/product/{gateway_sn}/requests 设备端向云平台发送请求,为了获取一些信息,比如上传的临时凭证 - sys/product/{gateway_sn}/status 设备上下线、更新拓扑 - thing/product/{gateway_sn}/property/set_reply 设备属性设置的响应 - thing/product/{gateway_sn}/drc/up DRC 协议上行*/ - + // 序列号提取 var sn = topic.Split("/")[2]; var tempStr = topic.Replace(sn, "*"); //Console.WriteLine($"成功调用主题 [{topic}] 的消息: {message}"); @@ -110,6 +98,7 @@ public class ConfigSubscribe : IJob var rtmp = "rtmp://175.27.168.120:6019/live/7"; switch (tempStr) { + // 目前主要处理了获取航线文件及临时凭证上传 case "thing/product/*/requests": switch (method) { @@ -149,7 +138,6 @@ public class ConfigSubscribe : IJob } } }; - // thing/product/{gateway_sn}/requests_reply var tempTopic = $"thing/product/{sn}/requests_reply"; await _mqttClientManager.PublishAsync(tempTopic, JsonConvert.SerializeObject(storageConfigRequest)); @@ -205,6 +193,7 @@ public class ConfigSubscribe : IJob } break; + // 主要处理了文件回传及航线进度 case "thing/product/*/events": switch (method) { @@ -552,7 +541,7 @@ public class ConfigSubscribe : IJob var waylineMissionState = (int)data.output.ext.wayline_mission_state; _logger.LogDebug("航线进度未跳过处理"); code = data.result; // result - + var taskAssign1 = _manageApp.GetTaskAssignByFlightId(flightId1); // 处理航线进度 ,也有可能是失败 if (code != 0) @@ -592,7 +581,6 @@ public class ConfigSubscribe : IJob } else { - // 航线成功 if (waylineMissionState.Equals(9)) // 航结结束,更新任务状态 { @@ -626,6 +614,7 @@ public class ConfigSubscribe : IJob }; await _sqlSugarClient.Updateable(record).IgnoreNullColumns().ExecuteCommandAsync(); } + var step = (int)data.output.progress.current_step; _logger.LogDebug($"航线进度:{waylineMissionState} {step} {message}"); if (step.Equals(25)) // todo 关于会接收到不同消息问题,如何处理 @@ -639,6 +628,7 @@ public class ConfigSubscribe : IJob _logger.LogInformation("跳过处理"); break; } + var task = await _sqlSugarClient.Queryable() .FirstAsync(y => y.Id == taskAssign1.TaskId); if (task != null && !string.IsNullOrEmpty(task.AIInspection) && @@ -667,7 +657,6 @@ public class ConfigSubscribe : IJob _liveInfo[$"{tid}{bid}"] = taskAssign1.TaskId; } } - } /*if (result.need_reply.Equals(1)) @@ -703,9 +692,6 @@ public class ConfigSubscribe : IJob } break; - // 任务资源处理 - // 航线进度处理 - // 任务取消 thing/product/*/services_reply case "thing/product/*/services_reply": switch (method) { @@ -714,6 +700,7 @@ public class ConfigSubscribe : IJob { break; } + // 已验证tid bid 是相同的 // 开启直播成功调用ai model _logger.LogDebug($"开启直播成功 {message}");