From 997353a844c1d10ab930cbcd95922640063535f0 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 09 Mar 2022 11:36:18 +0800
Subject: [PATCH] screen-api 根据AQI计算污染等级
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 25 +++++++++++++++----------
1 files changed, 15 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 8a11984..2544cad 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
@@ -4,15 +4,13 @@
import com.moral.api.entity.Device;
import com.moral.api.entity.Sensor;
import com.moral.api.entity.UnitConversion;
+import com.moral.api.utils.AdjustDataUtils;
+import com.moral.api.utils.UnitConvertUtils;
import com.moral.api.websocket.SingleDeviceServer;
-import com.moral.util.UnitConvertUtils;
-import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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;
@@ -35,7 +33,7 @@
@Slf4j
public class SecondDataConsumer implements ConsumerSeekAware {
- @KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
+ @KafkaListener(containerFactory = "secondDataListenerFactory", topics = "second_data")
public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
String messageStr = record.value();
Map<String, Object> message = (Map<String, Object>) JSON.parse(messageStr);
@@ -49,6 +47,11 @@
continue;
//������������������
Device device = socket.getDeviceAlarmInfo();
+ Map<String, Object> adjustFormula = socket.getAdjustFormula();
+ Map<String, Object> regionAqi = socket.getRegionAqi();
+ //������������
+ if(adjustFormula!=null&®ionAqi!=null)
+ message = AdjustDataUtils.adjust(message,adjustFormula,regionAqi);
//������������������������
Map<String, Object> resultMessgae = new HashMap<>();
//������������
@@ -59,12 +62,13 @@
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
String unit = sensor.getUnit();
- //������������������������������������������������
- Double sourceDataD = Double.valueOf(String.valueOf(message.get(code)));
+ Object value = message.get(code);
+ if(value==null)
+ continue;
+ Double sourceDataD = Double.valueOf(String.valueOf(value));
BigDecimal bg = new BigDecimal(sourceDataD);
- bg = bg.setScale(2,BigDecimal.ROUND_FLOOR);
+ bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);
String sourceData = bg.toString();
- //������������
//������������
if (!unitKey.equals(showUnitKey)) {//������������������������������������������������������������
String formula = sensor.getFormula();
@@ -86,7 +90,8 @@
resultMessgae.put(sensor.getCode(), resultData);
} else {
//������������
- sourceData = sourceData + " " + showUnit;
+ if(!showUnit.equals("���������"))
+ sourceData = sourceData + " " + showUnit;
resultMessgae.put(sensor.getCode(), sourceData);
}
}
--
Gitblit v1.8.0