From 7beea5916728a84617d4791775d0aac70ab32eee Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 10:40:43 +0800
Subject: [PATCH] 2025-12-12 zwy 优化，订阅视频时，谁订阅发给谁直播地址，其他订阅不变
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 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 6a3b2f3..36346d8 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
@@ -1,5 +1,7 @@
package com.ard.sample.manage.service.impl;
+import com.ard.common.core.redis.RedisConst;
+import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.sample.component.mqtt.model.CommonTopicReceiver;
import com.ard.sample.component.websocket.config.ConcurrentWebSocketSession;
import com.ard.sample.component.websocket.enums.MessageType;
@@ -66,6 +68,7 @@
//只要状态 "0":"作业准备中","1":"飞行作业中","5":"任务空闲"
if(code == 0 || code == 1 || code == 5) {
_deviceService.updateWorkType(deviceSn,code);
+ RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, code, RedisConst.DEVICE_ALIVE_SECOND);
}
}
}
@@ -73,12 +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);
+ 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");
@@ -92,7 +97,7 @@
wsMessage.getData().setHost(data);
sendMessageService.sendBatch(webSessions, wsMessage);
// 发送给websocket客户端
- _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATUS.getType(), dockOsd);
+ _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATUS.getType(), dockOsd, "");
}
}
}
--
Gitblit v1.9.3