From 0a0174e3b784f7f9f7c3abfb419c23ee26709d0f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 14:29:42 +0800
Subject: [PATCH] 2026-04-01 优化机场列表，注释获取机场视频地址代码。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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 18a8e27..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
@@ -39,7 +39,6 @@
}
-
@Override
public void pushTelemetryData(Collection<ConcurrentWebSocketSession> sessions,
CustomWebSocketMessage<TelemetryDTO> message, Object Object) {
@@ -55,49 +54,61 @@
wsMessage.setBizCode(BizCodeEnum.DOCK_OSD.getCode());
OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
// receiver.setType(MessageType.STATUS.getType());
- String dockOsd="";
- String dockOsdData="";
- try{
- dockOsdData=mapper.writeValueAsString(receiver.getData());
+ 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();
- if(code != null) {
+ if (code != null) {
//只要状态 "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);
+ 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");
+ 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")) {
+ 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.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6, RedisConst.DEVICE_ALIVE_SECOND);
+ RedisOpsUtils.set(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6);
}
}
}
- receiver.setType(MessageType.STATUS.getType()+"-network");
+ 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);
+// }
+
+ }
+ receiver.setType(MessageType.STATUS.getType() + "-network");
} else if (dockOsdData.contains("job_number")) {
- receiver.setType(MessageType.STATUS.getType()+"-job");
+ receiver.setType(MessageType.STATUS.getType() + "-job");
}
- dockOsd=mapper.writeValueAsString(receiver);
- }catch (Exception e){
+ dockOsd = mapper.writeValueAsString(receiver);
+ } catch (Exception e) {
e.printStackTrace();
}
wsMessage.getData().setHost(data);
sendMessageService.sendBatch(webSessions, wsMessage);
// 发送给websocket客户端
- _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATUS.getType(), dockOsd);
+ _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATUS.getType(), dockOsd, "");
}
}
}
--
Gitblit v1.9.3