From ba967da3b2d0d2f277113602e1d67ef848b7bb9a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 25 Nov 2025 14:33:52 +0800
Subject: [PATCH] 2025-11-25 zwy 增加rth_mode字段，默认为1；实体和DTO中增加@JsonInclude(JsonInclude.Include.NON_NULL)序列化时忽略所有 null 字段
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOnlineServiceImpl.java | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 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..bab84be 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
@@ -61,34 +61,27 @@
dockStatus = String.valueOf(RedisOpsUtils.get(RedisConst.OSD_STATUS_PREFIX + device.getDeviceSn()));
}
if(RedisOpsUtils.checkExist(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn())){
- droneStatus = String.valueOf(RedisOpsUtils.get(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