From dce0021131e955bac968cb2a7e24ce3673eb1a3b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 02 Aug 2021 17:22:15 +0800
Subject: [PATCH] 监测因子趋势图
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 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 c0660bb..c105c2f 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
@@ -6,9 +6,12 @@
import com.moral.api.entity.UnitConversion;
import com.moral.api.websocket.SingleDeviceServer;
import com.moral.util.UnitConvertUtils;
+import lombok.AllArgsConstructor;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.common.TopicPartition;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.listener.ConsumerSeekAware;
import org.springframework.stereotype.Component;
@@ -29,28 +32,35 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup3")
+ @KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
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) {
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();
//������sensor���������������������������������������������
if (ObjectUtils.isEmpty(formula)) {
@@ -61,15 +71,24 @@
}
}
//������������
- UnitConvertUtils.calculate(message.get(code),formula);
+ String resultData = UnitConvertUtils.calculate(sourceData, formula);
+ if (resultData != null) {
+ resultData += showUnit;
+ } else {//���������������������������null���������������������������������������������������������������
+ resultData = sourceData + unit;
+ }
+ resultMessgae.put(sensor.getCode(), resultData);
+ } else {
+ //������������
+ sourceData = 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());
+ resultMessgae.put("serverStartTime", serverStartTime);
socket.sendMessage(JSON.toJSONString(resultMessgae));
}
}
@@ -89,5 +108,6 @@
public void onIdleContainer(Map<TopicPartition, Long> map, ConsumerSeekCallback consumerSeekCallback) {
}
+
}
--
Gitblit v1.8.0