From 504eaab19115cad29fe1fe91f1bb478052ac4196 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 02 Apr 2026 16:50:29 +0800
Subject: [PATCH] 2026-04-02 优化机场视频推流顺序；在RTMP中先入库再推流，在RTSP单独推流。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 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 ca7c946..67cc4ad 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,16 +1,20 @@
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;
+import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.component.websocket.model.BizCodeEnum;
import com.ard.sample.component.websocket.model.CustomWebSocketMessage;
-import com.ard.sample.component.websocket.service.impl.WebSocketDockServer;
import com.ard.sample.manage.model.dto.DeviceDTO;
import com.ard.sample.manage.model.dto.TelemetryDTO;
import com.ard.sample.manage.model.enums.DeviceDomainEnum;
import com.ard.sample.manage.model.receiver.OsdDockReceiver;
import com.ard.sample.manage.service.IDeviceService;
import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,7 +29,7 @@
public class DockOSDServiceImpl extends AbstractTSAService {
@Autowired
- WebSocketDockServer _websocketdockserver;// = new WebSocketDockServer();
+ private DockWebSocketHandler _dockWebSocketHandler;
@Autowired
private IDeviceService _deviceService;
@@ -33,7 +37,6 @@
public DockOSDServiceImpl() {
super(null);
}
-
@Override
@@ -50,32 +53,62 @@
if (DeviceDomainEnum.DOCK.getVal() == device.getDomain()) {
wsMessage.setBizCode(BizCodeEnum.DOCK_OSD.getCode());
OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
- String dockOsd="";
- try{
- dockOsd=mapper.writeValueAsString(receiver.getData());
- if (dockOsd.contains("flighttask_step_code")) {
- JsonNode jsonNode = mapper.readTree(dockOsd);
+// receiver.setType(MessageType.STATUS.getType());
+ String dockOsd = "";
+ String dockOsdData = "";
+ try {
+ dockOsdData = mapper.writeValueAsString(receiver.getData());
+ if (dockOsdData.contains("flighttask_step_code")) {
+ JsonNode jsonNode = mapper.readTree(dockOsdData);
if (jsonNode.has("flighttask_step_code")) {
String deviceSn = device.getDeviceSn();
Long code = jsonNode.get("flighttask_step_code").asLong();
- _deviceService.updateWorkType(deviceSn,code);
+ if (code != null) {
+ //只要状态 "0":"作业准备中","1":"飞行作业中","5":"任务空闲"
+ if (code == 0 || code == 1 || code == 5) {
+ _deviceService.updateWorkType(deviceSn, code);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + deviceSn, code);
+ }
+ }
}
+ 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")) {
+ if (jsonNode.get("sub_device").has("device_sn")) {
+ String childDeviceSn = jsonNode.get("sub_device").get("device_sn").asText();
+ Long inDock = jsonNode.get("drone_in_dock").asLong();
+ Long deviceOnlineStatus = jsonNode.get("sub_device").get("device_online_status").asLong();
+ if (inDock.equals(1L) && deviceOnlineStatus.equals(0L)) {// 飞行器在舱内且关机状态为6
+ _deviceService.updateWorkType(childDeviceSn, 6L);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6);
+ }
+ }
+ }
+ if (jsonNode.has("cover_state")) {
+ // 舱盖状态存redis
+ RedisOpsUtils.set(RedisConst.COVER_STATE_OSD_PREFIX + device.getDeviceSn(), jsonNode.get("cover_state").asInt());
+// //实时监控机场内外舱盖状态
+// Integer coverState = jsonNode.get("cover_state").asInt();
+// if(coverState != null && (coverState == 1 || coverState == 0)) {
+// // 执行0和1的互转逻辑，结果赋值给变量（保持Integer类型）
+// Integer newCoverState = coverState == 0 ? 1 : 0;
+// _deviceService.setRedisCameraPosition(device.getDeviceSn(), newCoverState);
+// }
- } else if (dockOsd.contains("network_state")) {
- JsonNode jsonNode = mapper.readTree(dockOsd);
- if (jsonNode.has("drone_in_dock")) {
- String childDeviceSn=jsonNode.get("sub_device").get("device_sn").asText();
- Long inDock=jsonNode.get("drone_in_dock").asLong();
- _deviceService.updateWorkType(childDeviceSn,inDock);
}
- } else if (dockOsd.contains("job_number")) {
+ receiver.setType(MessageType.STATUS.getType() + "-network");
+ } else if (dockOsdData.contains("job_number")) {
+ receiver.setType(MessageType.STATUS.getType() + "-job");
}
- }catch (Exception e){
+ dockOsd = mapper.writeValueAsString(receiver);
+ } catch (Exception e) {
e.printStackTrace();
}
wsMessage.getData().setHost(data);
sendMessageService.sendBatch(webSessions, wsMessage);
- _websocketdockserver.sendToAll(dockOsd);
+ // 发送给websocket客户端
+ _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATUS.getType(), dockOsd, "");
}
}
}
--
Gitblit v1.9.3