From 91a88471d84246524548a318aec1f22735cfedc9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 15:48:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 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 b6d2030..c0660bb 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
@@ -1,14 +1,21 @@
package com.moral.api.kafka.consumer;
import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.Device;
+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;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.listener.ConsumerSeekAware;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -22,17 +29,49 @@
@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 = "SecondsDataGroup3")
+ 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);
- //System.out.println(message);
+ Map<String, String> message = (Map<String, String>) JSON.parse(messageStr);
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
- socket.sendMessage(message.toString());
+ //������������������
+ String mac = socket.getMac();
+ Map<String, Device> devicesInfo = socket.getDevicesInfo();
+ Device device = devicesInfo.get(mac);
+ //������������������������
+ Map<String, String> resultMessgae = new HashMap<>();
+ //������������
+ List<Sensor> sensors = device.getVersion().getSensors();//������������������������������
+ for (Sensor sensor : sensors) {
+ String code = sensor.getCode();
+ String showUnitKey = sensor.getShowUnitKey();
+ String unitKey = sensor.getUnitKey();
+ //������������
+ //������������
+ if (!unitKey.equals(showUnitKey)) {
+ String formula = sensor.getFormula();
+ //������sensor���������������������������������������������
+ if (ObjectUtils.isEmpty(formula)) {
+ List<UnitConversion> unitConversions = socket.getUnitConversions();
+ for (UnitConversion unitConversion : unitConversions) {
+ if (unitConversion.getOriginalUnitKey().equals(unitKey) && unitConversion.getTargetUnitKey().equals(showUnitKey))
+ formula = unitConversion.getFormula();
+ }
+ }
+ //������������
+ UnitConvertUtils.calculate(message.get(code),formula);
+ }
+ //������������
+ String showUnit = sensor.getShowUnit();
+ String value = message.get(code);
+ value += showUnit;
+ resultMessgae.put(sensor.getCode(), value);
+ }
+ resultMessgae.put("DataTime", message.get("DataTime"));
+ socket.sendMessage(JSON.toJSONString(resultMessgae));
}
- // System.out.println(message);
}
@Override
@@ -51,3 +90,4 @@
}
}
+
--
Gitblit v1.8.0