From 3a92dc7ef668997c9b8cecb6ee23618db8bfae13 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 28 Oct 2025 16:24:07 +0800
Subject: [PATCH] 2025-10-28 zwy 更新,机场状态返回的3个JSON文档添加type值,区分三个文档,方便前端取值。

---
 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java |    8 +++++---
 1 files changed, 5 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..6a3b2f3 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
@@ -52,11 +52,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);
@@ -70,7 +69,7 @@
                             }
                         }
                     }
-
+                    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")) {
@@ -82,8 +81,11 @@
                             _deviceService.updateWorkType(childDeviceSn,6L);
                         }
                     }
+                    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