From 929bdcb35152ce74774a2abf8a3a8b5d8d9b7fa3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 03 Nov 2025 16:57:09 +0800
Subject: [PATCH] 2025-11-3 zwy 机场与飞行器状态中机场sn字段值改为gateway
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
index 75a8391..3d30a70 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java
@@ -63,32 +63,25 @@
if(RedisOpsUtils.checkExist(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn())){
droneStatus = String.valueOf(RedisOpsUtils.get(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn()));;
}
- String json = getJSONString(device.getDeviceSn(), dockStatus, device.getChildDeviceSn(), droneStatus);
+ String json = getJSONString(MessageType.STATE.getType(), device.getDeviceSn(), dockStatus, droneStatus);
// 发送给websocket客户端
_dockWebSocketHandler.sendMessageToSubscribers(device.getDeviceSn(), MessageType.STATE.getType(), json);
}
}
- public String getJSONString(String dockSn, String dockStatus, String droneSn, String droneStatus){
+ public String getJSONString(String messageType, String dockSn, String dockStatus, String droneStatus){
Map<String, Object> json = new HashMap<>();
json.put("code", 200);
- json.put("type", MessageType.STATE.getType());
+ json.put("gateway", dockSn);
+ json.put("type", messageType);
json.put("message", "success");
Map<String, String> data = new HashMap<>();
- data.put("docksn", dockSn);
- data.put("state", dockStatus);
+ data.put("dockstate", dockStatus);
+ data.put("dronestate", droneStatus);
- Map<String, String> data1 = new HashMap<>();
- data1.put("droneSn", droneSn);
- data1.put("state", droneStatus);
-
- List<Map<String, String>> lstMap = new ArrayList<>();
- lstMap.add(data);
- lstMap.add(data1);
-
- json.put("data", lstMap);
+ json.put("data", data);
// 将Map转换为JSON字符串
String jsonString = "";
--
Gitblit v1.9.3