From 9d531004aba4b9ce461dc47f85338f5c08ef4870 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:46:05 +0800
Subject: [PATCH] screen-aqi 增加臭气模拟值
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 22 ++++++++++++++++------
1 files changed, 16 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 a768601..68fcd33 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
@@ -35,7 +35,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);
@@ -60,12 +60,21 @@
String unitKey = sensor.getUnitKey();
String unit = sensor.getUnit();
//���������������������������������������������
- if(message.get(code)==null)
- continue;
+ Object value = message.get(code);
//������������������������������������������������
- Double sourceDataD = Double.valueOf(String.valueOf(message.get(code)));
+ /*if(value==null) ���������
+ continue;
+ Double sourceDataD = Double.valueOf(String.valueOf(value));*/
+ //��������������������������������������������� start
+ Double sourceDataD = null;
+ if (value != null) {
+ sourceDataD = Double.valueOf(String.valueOf(value));
+ }else{
+ sourceDataD = 5.00d;
+ }
+ //��������������������������������������������� end
BigDecimal bg = new BigDecimal(sourceDataD);
- bg = bg.setScale(2,BigDecimal.ROUND_FLOOR);
+ bg = bg.setScale(2, BigDecimal.ROUND_FLOOR);
String sourceData = bg.toString();
//������������
//������������
@@ -89,7 +98,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