From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/webSocketServer/BSAQIWebSocketServerTest.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/BSAQIWebSocketServerTest.java b/src/main/java/com/moral/webSocketServer/BSAQIWebSocketServerTest.java
index ac6ada1..2341912 100644
--- a/src/main/java/com/moral/webSocketServer/BSAQIWebSocketServerTest.java
+++ b/src/main/java/com/moral/webSocketServer/BSAQIWebSocketServerTest.java
@@ -9,6 +9,7 @@
import com.rabbitmq.client.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import javax.annotation.PostConstruct;
import javax.websocket.*;
@@ -155,8 +156,14 @@
//���������������������������������
sortMap.put("name", device.getName());
sortMap.put("address", device.getAddress());
- //���������������������������������
- sortMap.putAll(param);
+ //������������
+ param.forEach((key, value) -> {
+ Sensor sensor = sensors.get(key);
+ if (!ObjectUtils.isEmpty(sensor)) {
+ String unit = ObjectUtils.isEmpty(sensor.getUnit()) ? "" : (String) sensor.getUnit();
+ sortMap.put(sensor.getSensorKey(), value + unit);
+ }
+ });
sendMessage(JSON.toJSONString(sortMap));
} catch (IOException e) {
log.error("������mac������������������������");
--
Gitblit v1.8.0