From 3dbe2c21c05072cdab5a7f75a0bd154bd9207552 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 13:09:12 +0800
Subject: [PATCH] screen-manage 实时数据message，添加time，datatime，time1等测试数据
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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..cbdb747 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
@@ -32,7 +32,7 @@
@KafkaListener(topics = "second_data", groupId = "SecondsDataGroup998")
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);
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
@@ -41,7 +41,7 @@
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 +50,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 +64,7 @@
}
}
//������������
- String resultData = UnitConvertUtils.calculate(message.get(code), formula);
+ String resultData = UnitConvertUtils.calculate(sourceData, formula);
if (resultData != null) {
resultData+=showUnit;
}else{//���������������������������null���������������������������������������������������������������
@@ -77,7 +77,10 @@
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());
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
}
@@ -97,5 +100,6 @@
public void onIdleContainer(Map<TopicPartition, Long> map, ConsumerSeekCallback consumerSeekCallback) {
}
+
}
--
Gitblit v1.8.0