From f8c2609bca86f6e4a2acd2e92a7eae29b86c2070 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 14:05:42 +0800
Subject: [PATCH] screen-api 添加从kafka取出时间戳
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..9439f3a 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
@@ -29,15 +29,19 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup998")
+ @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup996")
public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
String messageStr = record.value();
Map<String, Object> message = (Map<String, Object>) JSON.parse(messageStr);
+ long serverStartTime = System.currentTimeMillis();
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
- //������������������
+ String messageMac = (String) message.get("mac");
String mac = socket.getMac();
+ if(!mac.equalsIgnoreCase(messageMac))
+ continue;
+ //������������������
Map<String, Device> devicesInfo = socket.getDevicesInfo();
Device device = devicesInfo.get(mac);
//������������������������
@@ -77,7 +81,11 @@
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());
+ resultMessgae.put("serverStartTime",serverStartTime);
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
}
--
Gitblit v1.8.0