From 0197c2fcac5fdb701ff91dcea0d98ec226bc008d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 13 Oct 2021 15:21:08 +0800
Subject: [PATCH] 删除historySecondSpecial相关类
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 8fe48a8..8a11984 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
@@ -7,6 +7,7 @@
import com.moral.api.websocket.SingleDeviceServer;
import com.moral.util.UnitConvertUtils;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
@@ -31,13 +32,14 @@
* @Version TODO
**/
@Component
+@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
@KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
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();
+ //long serverStartTime = System.currentTimeMillis();
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
@@ -46,8 +48,7 @@
if (!mac.equalsIgnoreCase(messageMac))
continue;
//������������������
- Map<String, Device> devicesInfo = socket.getDevicesInfo();
- Device device = devicesInfo.get(mac);
+ Device device = socket.getDeviceAlarmInfo();
//������������������������
Map<String, Object> resultMessgae = new HashMap<>();
//������������
@@ -89,11 +90,12 @@
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);
+ //���������������������������������
+ //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