From 60477d72e953fc73744943db3c63f26d8eb94a19 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 22 Nov 2021 09:19:43 +0800
Subject: [PATCH] screen-api 增加获取柱状图表格数据的mock接口
---
screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..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);
@@ -59,10 +59,22 @@
String showUnitKey = sensor.getShowUnitKey();
String unitKey = sensor.getUnitKey();
String unit = sensor.getUnit();
+ //���������������������������������������������
+ 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();
//������������
//������������
@@ -86,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