From d68181ce2faef4821d6d8a8ffb8027480a6262c3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 17:01:20 +0800
Subject: [PATCH] 2025-11-5 zwy websockeet增加Type:livestream,开启机场和飞行器的直播接口， 增加LiveStreamHandler对开启直播和关闭直播的处理； redis增加WEBSOCKET_VideoId_PREFIX，存储videoid，关闭直播功能时使用；
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 5918651..5b89cae 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;
@@ -52,11 +54,10 @@
if (DeviceDomainEnum.DOCK.getVal() == device.getDomain()) {
wsMessage.setBizCode(BizCodeEnum.DOCK_OSD.getCode());
OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
- receiver.setType(MessageType.STATUS.getType());
+// receiver.setType(MessageType.STATUS.getType());
String dockOsd="";
String dockOsdData="";
try{
- dockOsd=mapper.writeValueAsString(receiver);
dockOsdData=mapper.writeValueAsString(receiver.getData());
if (dockOsdData.contains("flighttask_step_code")) {
JsonNode jsonNode = mapper.readTree(dockOsdData);
@@ -67,10 +68,11 @@
//只要状态 "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);
}
}
}
-
+ receiver.setType(MessageType.STATUS.getType()+"-flighttask");
} 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")) {
@@ -80,10 +82,14 @@
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");
} else if (dockOsdData.contains("job_number")) {
+ receiver.setType(MessageType.STATUS.getType()+"-job");
}
+ dockOsd=mapper.writeValueAsString(receiver);
}catch (Exception e){
e.printStackTrace();
}
--
Gitblit v1.9.3