From 64d307134bfd5dfcc96a6bf363d385004ee33263 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 17 Jan 2026 16:18:47 +0800
Subject: [PATCH] 2026-01-17 zwy 优化
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 ca96e58..d223b59 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
@@ -8,6 +8,7 @@
import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.sample.component.websocket.enums.MessageType;
import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
+import com.ard.sample.component.websocket.handler.LiveStreamHandler;
import com.ard.sample.component.websocket.service.ISendMessageService;
import com.ard.sample.manage.model.dto.BasicDeviceProperty;
import com.ard.sample.manage.model.dto.DeviceDTO;
@@ -46,6 +47,9 @@
@Autowired
private IDeviceService _deviceService;
+
+ @Autowired
+ private LiveStreamHandler _liveStreamHandler;
// @Autowired
// private IWebSocketManageService webSocketManageService;
@@ -86,7 +90,25 @@
boolean isExist = deviceService.checkDeviceOnline(sn);
if (!isExist) {
- return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
+ return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(), CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
+ }
+ DeviceDTO device = (DeviceDTO) RedisOpsUtils.get(RedisConst.DEVICE_ONLINE_PREFIX + sn);
+ // 重启机场时清redis视频直播地址，机场重启不掉线。但是流停了。
+ if(RemoteControlMethodEnum.DEVICE_REBOOT == controlMethodEnum) {
+ // 重启机场时，读取舱盖状态，开舱盖不让重启，关舱盖重启
+ Integer cover_state = (Integer)RedisOpsUtils.get(RedisConst.COVER_STATE_OSD_PREFIX + device.getDeviceSn());
+ if(cover_state != null && cover_state != 0) {
+ return ResponseResult.error(111111,"请关闭舱盖再执行重启操作！");
+ }
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
+ RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
+ }
+ if(RemoteControlMethodEnum.DRONE_CLOSE == controlMethodEnum) {
+ // 飞行器关机时drone_close，关闭飞行器视频流
+ _liveStreamHandler.StopLiveStreaming(device.getChildDeviceSn());
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
+ log.info("SN: {}-飞行器关机，停止直播并删除redis直播信息！", device.getChildDeviceSn());
}
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + sn + TopicConst.SERVICES_SUF;
String bid = UUID.randomUUID().toString();
@@ -123,11 +145,6 @@
//关闭，摄像头为舱外；将摄像头状态存到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);
- }
return ResponseResult.success();
}
@@ -145,7 +162,7 @@
String deviceSn = receiver.getGateway();
if(method.equals("cover_close")){
_deviceService.updateWorkType(deviceSn, 2L);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, 2, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + deviceSn, 2);
}
String sn = RedisOpsUtils.get(key).toString();
receiver.setType(MessageType.PROGRESS.getType());
@@ -180,8 +197,17 @@
// 更新设备列表状态--飞行器开机中...
if(method.equals("drone_open")){
_deviceService.updateWorkType(device.getChildDeviceSn(), 7L);
- RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 7, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 7);
}
+ // 机场重启状态--ok后删除redis状态
+ if(method.equals("device_reboot")){
+ if(eventsReceiver.getOutput().getProgress().getPercent() == 100){
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + sn);
+ RedisOpsUtils.del(RedisConst.COVER_STATE_PREFIX + sn);
+ RedisOpsUtils.del(RedisConst.WEBSOCKET_VIDEO_ADDRESS_PREFIX + device.getChildDeviceSn());
+ }
+ }
+
String dockProgress ="";
try {
--
Gitblit v1.9.3