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 | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 49ac907..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
@@ -5,6 +5,7 @@
import com.moral.api.entity.Sensor;
import com.moral.api.entity.UnitConversion;
import com.moral.api.websocket.SingleDeviceServer;
+import com.moral.util.UnitConvertUtils;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
@@ -28,10 +29,10 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data",groupId = "SecondsDataGroup3")
- public void listen(ConsumerRecord<String, String> record , Consumer consumer) throws Exception {
+ @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
@@ -40,31 +41,46 @@
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) {
String code = sensor.getCode();
+ String showUnit = sensor.getShowUnit();
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
+ String unit = sensor.getUnit();
+ String sourceData = String.valueOf(message.get(code));
//������������
//������������
- if(!unitKey.equals(showUnitKey)){
+ if (!unitKey.equals(showUnitKey)) {//������������������������������������������������������������
String formula = sensor.getFormula();
- if(ObjectUtils.isEmpty(formula)){
+ //������sensor���������������������������������������������
+ if (ObjectUtils.isEmpty(formula)) {
List<UnitConversion> unitConversions = socket.getUnitConversions();
- System.out.println(unitConversions);
- }else{
-
+ for (UnitConversion unitConversion : unitConversions) {
+ if (unitConversion.getOriginalUnitKey().equals(unitKey) && unitConversion.getTargetUnitKey().equals(showUnitKey))
+ formula = unitConversion.getFormula();
+ }
}
+ //������������
+ String resultData = UnitConvertUtils.calculate(sourceData, formula);
+ if (resultData != null) {
+ resultData+=showUnit;
+ }else{//���������������������������null���������������������������������������������������������������
+ resultData = sourceData+unit;
+ }
+ resultMessgae.put(sensor.getCode(), resultData);
+ } else {
+ //������������
+ sourceData += showUnit;
+ resultMessgae.put(sensor.getCode(), sourceData);
}
- //������������
- String showUnit = sensor.getShowUnit();
- String value = message.get(code);
- value+=showUnit;
- resultMessgae.put(sensor.getCode(),value);
}
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));
}
}
@@ -84,5 +100,6 @@
public void onIdleContainer(Map<TopicPartition, Long> map, ConsumerSeekCallback consumerSeekCallback) {
}
+
}
--
Gitblit v1.8.0