From f1f702f03e617ac8b49ea5fe484b41885ea83f0c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 16:52:05 +0800
Subject: [PATCH] screen-manage 删除local配置文件
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 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 f804783..ac723f2 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
@@ -3,13 +3,16 @@
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;
@@ -26,11 +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);
- //System.out.println(message);
+ Map<String, String> message = (Map<String, String>) JSON.parse(messageStr);
CopyOnWriteArraySet<SingleDeviceServer> sockets = SingleDeviceServer.sockets;
for (SingleDeviceServer socket : sockets) {
//���������������������������socket
@@ -39,19 +41,43 @@
Map<String, Device> devicesInfo = socket.getDevicesInfo();
Device device = devicesInfo.get(mac);
//������������������������
- Map<String,String> resultMessgae = new HashMap<>();
+ Map<String, String> 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 = message.get(code);
+ //������������
//������������
- //������������
- String value = message.get(code);
- value+=showUnit;
- resultMessgae.put(sensor.getName(),value);
+ 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();
+ }
+ }
+ //������������
+ String resultData = UnitConvertUtils.calculate(message.get(code), formula);
+ if (resultData != null) {
+ resultData+=showUnit;
+ }else{//���������������������������null���������������������������������������������������������������
+ resultData = sourceData+unit;
+ }
+ resultMessgae.put(sensor.getCode(), resultData);
+ } else {
+ //������������
+ sourceData += showUnit;
+ resultMessgae.put(sensor.getCode(), sourceData);
+ }
}
- resultMessgae.put("DataTime",message.get("DataTime"));
+ resultMessgae.put("DataTime", message.get("DataTime"));
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
}
@@ -72,3 +98,4 @@
}
}
+
--
Gitblit v1.8.0