From f3de8ac216bfc05348222e2b963ef3629358ae62 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 06 Dec 2025 15:49:20 +0800
Subject: [PATCH] 2025-12-06 zwy 修改设备属性设置方法，不抛异常，返回错误号与错误提示。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 5b89cae..18a8e27 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
@@ -76,13 +76,14 @@
} 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")) {
- String childDeviceSn=jsonNode.get("sub_device").get("device_sn").asText();
- Long inDock=jsonNode.get("drone_in_dock").asLong();
- Long deviceOnlineStatus=jsonNode.get("sub_device").get("device_online_status").asLong();
- if(inDock.equals(1L) && deviceOnlineStatus.equals(0L))
- {// 飞行器在舱内且关机状态为6
- _deviceService.updateWorkType(childDeviceSn,6L);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6, RedisConst.DEVICE_ALIVE_SECOND);
+ if(jsonNode.get("sub_device").has("device_sn")) {
+ String childDeviceSn = jsonNode.get("sub_device").get("device_sn").asText();
+ Long inDock = jsonNode.get("drone_in_dock").asLong();
+ Long deviceOnlineStatus = jsonNode.get("sub_device").get("device_online_status").asLong();
+ if (inDock.equals(1L) && deviceOnlineStatus.equals(0L)) {// 飞行器在舱内且关机状态为6
+ _deviceService.updateWorkType(childDeviceSn, 6L);
+ RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6, RedisConst.DEVICE_ALIVE_SECOND);
+ }
}
}
receiver.setType(MessageType.STATUS.getType()+"-network");
--
Gitblit v1.9.3