From 7cbb7a70344309684ef7bdab4603b06b07e61efb Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 30 Sep 2020 16:08:23 +0800
Subject: [PATCH] 传输参数排序
---
src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java b/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java
index 44c202a..198f26a 100644
--- a/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java
+++ b/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java
@@ -18,6 +18,7 @@
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -198,6 +199,7 @@
String deviceMac = (String) param.get("mac");
if (mac.equals(deviceMac)) {
try {
+ Map<String,Object> sortMap = new LinkedHashMap<>();
Map<String, Object> map = new HashMap<>();
param.forEach((key, value) -> {
Sensor sensor = sensors.get(key);
@@ -211,12 +213,13 @@
map.put("flag",1);
for (Device device : deviceList) {
if(mac.equals(device.getMac())){
- map.put("������",device.getName());
- map.put("������",device.getAddress());
+ sortMap.put("������",device.getName());
+ sortMap.put("������",device.getAddress());
+ sortMap.putAll(map);
break;
}
}
- sendMessage(JSON.toJSONString(map));
+ sendMessage(JSON.toJSONString(sortMap));
} catch (IOException e) {
log.error("������mac������������������������");
}
--
Gitblit v1.8.0