From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java |    5 +++++
 1 files changed, 5 insertions(+), 0 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 aa5bcc7..a768601 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
@@ -7,6 +7,7 @@
 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;
@@ -31,6 +32,7 @@
  * @Version TODO
  **/
 @Component
+@Slf4j
 public class SecondDataConsumer implements ConsumerSeekAware {
 
     @KafkaListener(containerFactory = "secondDataListenerFactory",topics = "second_data")
@@ -57,6 +59,9 @@
                 String showUnitKey = sensor.getShowUnitKey();
                 String unitKey = sensor.getUnitKey();
                 String unit = sensor.getUnit();
+                //���������������������������������������������
+                if(message.get(code)==null)
+                    continue;
                 //������������������������������������������������
                 Double sourceDataD = Double.valueOf(String.valueOf(message.get(code)));
                 BigDecimal bg = new BigDecimal(sourceDataD);

--
Gitblit v1.8.0