From 8d33953c620f4cfd0a4648e5938302f8fe0d331c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 13:16:25 +0800
Subject: [PATCH] screen-manage 修改kafka消费者BUG
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
index 8dd831d..d5981c4 100644
--- a/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
+++ b/screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java
@@ -36,8 +36,11 @@
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
- //������������������
+ String messageMac = (String) message.get("mac");
String mac = socket.getMac();
+ if(!mac.equals(messageMac))
+ continue;
+ //������������������
Map<String, Device> devicesInfo = socket.getDevicesInfo();
Device device = devicesInfo.get(mac);
//������������������������
@@ -77,6 +80,9 @@
resultMessgae.put(sensor.getCode(), sourceData);
}
}
+ resultMessgae.put("DataTime",message.get("DataTime"));
+ resultMessgae.put("time",message.get("time"));
+ resultMessgae.put("time1",message.get("time1"));
resultMessgae.put("serverTime",System.currentTimeMillis());
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
--
Gitblit v1.8.0