From be7a24c1df1872236b5a80ab2735d2ad19c72051 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 17 Dec 2025 15:38:18 +0800
Subject: [PATCH] 2025-12-16 zwy 优化飞行器关机时，关闭直接并删除直播地址
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java | 71 +++++++++++++++++++++++++++++++----
1 files changed, 62 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 b234b6b..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;
@@ -47,6 +48,9 @@
@Autowired
private IDeviceService _deviceService;
+ @Autowired
+ private LiveStreamHandler _liveStreamHandler;
+
// @Autowired
// private IWebSocketManageService webSocketManageService;
@@ -63,13 +67,21 @@
return ResponseResult.error("The " + serviceIdentifier + " method does not exist.");
}
+
Object data = "";
// Add parameter validation.
if (Objects.nonNull(controlMethodEnum.getClazz())) {
if (Objects.isNull(param)) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
- BasicDeviceProperty basicDeviceProperty = mapper.convertValue(param.getAction(), controlMethodEnum.getClazz());
+ BasicDeviceProperty basicDeviceProperty = null;
+ if(serviceIdentifier.equals("sdr_workmode_switch")){
+ basicDeviceProperty= mapper.convertValue(param.getLink_workmode(), controlMethodEnum.getClazz());
+ }
+ else
+ {
+ basicDeviceProperty = mapper.convertValue(param.getAction(), controlMethodEnum.getClazz());
+ }
if (!basicDeviceProperty.valid()) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
@@ -78,7 +90,25 @@
boolean isExist = deviceService.checkDeviceOnline(sn);
if (!isExist) {
- return ResponseResult.error("The dock is offline.");
+ 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();
@@ -94,14 +124,28 @@
ServiceReply<EventsOutputReceiver> serviceReply = mapper.convertValue(
serviceReplyOpt, new TypeReference<ServiceReply<EventsOutputReceiver>>() {});
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
- return ResponseResult.error(serviceReply.getResult(),
- Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus() : "errorCode: "
- + serviceReply.getResult());
+ String errorMsg = CommonErrorEnum.getMsgByCode(serviceReply.getResult());
+ return ResponseResult.error(serviceReply.getResult(),errorMsg);
+// return ResponseResult.error(serviceReply.getResult(),
+// Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus() : "errorCode: "
+// + serviceReply.getResult());
}
if (controlMethodEnum.getProgress()) {
RedisOpsUtils.setWithExpire(serviceIdentifier + RedisConst.DELIMITER + bid, sn,
RedisConst.DEVICE_ALIVE_SECOND * RedisConst.DEVICE_ALIVE_SECOND);
}
+ // 执行操作成功后，更新摄像头内外镜头状态
+ if(RemoteControlMethodEnum.COVER_OPEN == controlMethodEnum) {
+ // 打开盖子,切换机场舱内摄像头镜头
+ //打开，摄像头为舱内；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
+ _deviceService.setRedisCameraPosition(sn,0);
+ }
+ if(RemoteControlMethodEnum.COVER_CLOSE == controlMethodEnum) {
+ // 关闭盖子,切换机场舱外摄像头镜头
+ //关闭，摄像头为舱外；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
+ _deviceService.setRedisCameraPosition(sn,1);
+ }
+
return ResponseResult.success();
}
@@ -118,14 +162,14 @@
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());
EventsReceiver<EventsOutputReceiver> eventsReceiver = mapper.convertValue(receiver.getData(),
new TypeReference<EventsReceiver<EventsOutputReceiver>>(){});
eventsReceiver.setBid(receiver.getBid());
- eventsReceiver.setSn(sn);
+ eventsReceiver.setGateway(sn);
eventsReceiver.setType(MessageType.PROGRESS.getType());
eventsReceiver.setMethod(receiver.getMethod());
@@ -153,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 {
@@ -164,7 +217,7 @@
e.printStackTrace();
}
// 设备控制进度消息websocket发给前端
- _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress);
+ _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress, "");
if (receiver.getNeedReply() != null && receiver.getNeedReply() == 1) {
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC) + TopicConst._REPLY_SUF;
--
Gitblit v1.9.3