From b586e1764e16ee490d50c991849dba8e7068f579 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 03 Nov 2025 11:14:16 +0800
Subject: [PATCH] 2025-11-3 zwy 新增state标记，redis中增加设备的实时状态，机场内飞行器的状态信息websocket发给前端；
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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..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,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;
@@ -50,32 +54,49 @@
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());
String dockOsd="";
+ String dockOsdData="";
try{
- dockOsd=mapper.writeValueAsString(receiver.getData());
- if (dockOsd.contains("flighttask_step_code")) {
- JsonNode jsonNode = mapper.readTree(dockOsd);
+ 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.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, code, RedisConst.DEVICE_ALIVE_SECOND);
+ }
+ }
}
-
- } else if (dockOsd.contains("network_state")) {
- JsonNode jsonNode = mapper.readTree(dockOsd);
- if (jsonNode.has("drone_in_dock")) {
+ 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")) {
String childDeviceSn=jsonNode.get("sub_device").get("device_sn").asText();
Long inDock=jsonNode.get("drone_in_dock").asLong();
- _deviceService.updateWorkType(childDeviceSn,inDock);
+ 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);
+ }
}
- } else if (dockOsd.contains("job_number")) {
+ 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();
}
wsMessage.getData().setHost(data);
sendMessageService.sendBatch(webSessions, wsMessage);
- _websocketdockserver.sendToAll(dockOsd);
+ // 发送给websocket客户端
+ _dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATUS.getType(), dockOsd);
}
}
}
--
Gitblit v1.9.3