From 06837debd4f84d57c33083d395984fa2fb9bd306 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 16 Dec 2025 18:47:56 +0800
Subject: [PATCH] 2025-12-16 zwy 优化机场重启后视频推流。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 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 5728b73..76a4e44 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
@@ -63,13 +63,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 +86,14 @@
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());
+ }
+ // 重启机场时清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();
@@ -94,14 +109,29 @@
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,13 +148,14 @@
String deviceSn = receiver.getGateway();
if(method.equals("cover_close")){
_deviceService.updateWorkType(deviceSn, 2L);
+ 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());
@@ -152,6 +183,7 @@
// 更新设备列表状态--飞行器开机中...
if(method.equals("drone_open")){
_deviceService.updateWorkType(device.getChildDeviceSn(), 7L);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 7);
}
String dockProgress ="";
@@ -162,7 +194,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