From 0baf2a9a1f72a1239183a84e29627e585f6bdd3a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 16 Dec 2025 19:01:39 +0800
Subject: [PATCH] 2025-12-16 zwy 优化机场重启后视频推流。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
index 76a4e44..a458499 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
@@ -88,13 +88,6 @@
if (!isExist) {
return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(), CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
}
- // 重启机场时清redis视频直播地址,机场重启不掉线。但是流停了。
- if(RemoteControlMethodEnum.DEVICE_REBOOT == controlMethodEnum) {
- RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
- RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
- // 重启机场时,关闭飞行器
- this.controlDock(sn,"drone_close",null);
- }
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + sn + TopicConst.SERVICES_SUF;
String bid = UUID.randomUUID().toString();
ServiceReply serviceReplyOpt = messageSenderService.publishWithReply(
@@ -130,8 +123,13 @@
//关闭,摄像头为舱外;将摄像头状态存到redis,格式为:CONVERSTATE:设备SN:1(舱外)或0(舱内)
_deviceService.setRedisCameraPosition(sn,1);
}
-
-
+ // 重启机场时清redis视频直播地址,机场重启不掉线。但是流停了。
+ if(RemoteControlMethodEnum.DEVICE_REBOOT == controlMethodEnum) {
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
+ RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
+ DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + sn);
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
+ }
return ResponseResult.success();
}
--
Gitblit v1.9.3