From 3b29244703787dda85386167dca4126b5b0f150c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 13:58:34 +0800
Subject: [PATCH] screen-api 添加查询五分钟数据接口以及查询国控站位置接口
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 6 ++++--
1 files changed, 4 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 d5981c4..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,16 +29,17 @@
@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.equals(messageMac))
+ if(!mac.equalsIgnoreCase(messageMac))
continue;
//������������������
Map<String, Device> devicesInfo = socket.getDevicesInfo();
@@ -84,6 +85,7 @@
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