From d97d902c88d0c718152f0a9f099de209500fc18a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 26 Jul 2021 17:35:42 +0800
Subject: [PATCH] 注释添加
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 ac723f2..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,19 +29,23 @@
@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, String> message = (Map<String, String>) JSON.parse(messageStr);
+ 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);
//������������������������
- Map<String, String> resultMessgae = new HashMap<>();
+ Map<String, Object> resultMessgae = new HashMap<>();
//������������
List<Sensor> sensors = device.getVersion().getSensors();//������������������������������
for (Sensor sensor : sensors) {
@@ -50,7 +54,7 @@
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
String unit = sensor.getUnit();
- String sourceData = message.get(code);
+ String sourceData = String.valueOf(message.get(code));
//������������
//������������
if (!unitKey.equals(showUnitKey)) {//������������������������������������������������������������
@@ -64,7 +68,7 @@
}
}
//������������
- String resultData = UnitConvertUtils.calculate(message.get(code), formula);
+ String resultData = UnitConvertUtils.calculate(sourceData, formula);
if (resultData != null) {
resultData+=showUnit;
}else{//���������������������������null���������������������������������������������������������������
@@ -77,7 +81,11 @@
resultMessgae.put(sensor.getCode(), sourceData);
}
}
- resultMessgae.put("DataTime", message.get("DataTime"));
+ 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));
}
}
@@ -97,5 +105,6 @@
public void onIdleContainer(Map<TopicPartition, Long> map, ConsumerSeekCallback consumerSeekCallback) {
}
+
}
--
Gitblit v1.8.0