From b079a38e4cf9a0c0eac16ec63cc5ae297824389a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 01 Nov 2025 12:32:30 +0800
Subject: [PATCH] 2025-11-1 zwy liveCapacityReceiver参数为null发生异常； 机场设备在刚开机时，发送的state状态时，直播能力前三次发送的是空，可能是由于刚开机，等待各设备开机，第四次为正常数据。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java
index 5918651..6a3b2f3 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java
@@ -52,11 +52,10 @@
if (DeviceDomainEnum.DOCK.getVal() == device.getDomain()) {
wsMessage.setBizCode(BizCodeEnum.DOCK_OSD.getCode());
OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
- receiver.setType(MessageType.STATUS.getType());
+// receiver.setType(MessageType.STATUS.getType());
String dockOsd="";
String dockOsdData="";
try{
- dockOsd=mapper.writeValueAsString(receiver);
dockOsdData=mapper.writeValueAsString(receiver.getData());
if (dockOsdData.contains("flighttask_step_code")) {
JsonNode jsonNode = mapper.readTree(dockOsdData);
@@ -70,7 +69,7 @@
}
}
}
-
+ receiver.setType(MessageType.STATUS.getType()+"-flighttask");
} else if (dockOsdData.contains("network_state")) {
JsonNode jsonNode = mapper.readTree(dockOsdData);
if (jsonNode.has("drone_in_dock") && jsonNode.get("sub_device").has("device_online_status")) {
@@ -82,8 +81,11 @@
_deviceService.updateWorkType(childDeviceSn,6L);
}
}
+ receiver.setType(MessageType.STATUS.getType()+"-network");
} else if (dockOsdData.contains("job_number")) {
+ receiver.setType(MessageType.STATUS.getType()+"-job");
}
+ dockOsd=mapper.writeValueAsString(receiver);
}catch (Exception e){
e.printStackTrace();
}
--
Gitblit v1.9.3