From 6398918ca0f0a0471b4feec76341c168cbe58da8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 17 Oct 2025 16:22:17 +0800
Subject: [PATCH] 2025-10-17 zwy 接收机器状态信息时,将机场、飞行器工作状态入库更新,并将机场信息websocket发送给前端。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 fb90647..ca7c946 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
@@ -4,10 +4,14 @@
import com.ard.sample.component.websocket.config.ConcurrentWebSocketSession;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collection;
@@ -20,9 +24,17 @@
@Service
public class DockOSDServiceImpl extends AbstractTSAService {
+ @Autowired
+ WebSocketDockServer _websocketdockserver;// = new WebSocketDockServer();
+
+ @Autowired
+ private IDeviceService _deviceService;
+
public DockOSDServiceImpl() {
super(null);
}
+
+
@Override
public void pushTelemetryData(Collection<ConcurrentWebSocketSession> sessions,
@@ -38,8 +50,32 @@
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);
+ if (jsonNode.has("flighttask_step_code")) {
+ String deviceSn = device.getDeviceSn();
+ Long code = jsonNode.get("flighttask_step_code").asLong();
+ _deviceService.updateWorkType(deviceSn,code);
+ }
+
+ } 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")) {
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
wsMessage.getData().setHost(data);
sendMessageService.sendBatch(webSessions, wsMessage);
+ _websocketdockserver.sendToAll(dockOsd);
}
}
}
--
Gitblit v1.9.3