From 1ab0b018c6d0b5a12b5310ae23f37cb9e5a2887b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Sep 2021 10:07:42 +0800
Subject: [PATCH] update

---
 screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 3f0c77f..c9701ec 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -65,6 +65,8 @@
             Map<String, Object> sensorValues = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_FIVE_MINUTES, mac);
             //������������������������������������
             HistoryFiveMinutely dbHistoryFiveMinutely = queryLastDataByMac(mac);
+            if(ObjectUtils.isEmpty(dbHistoryFiveMinutely))
+                continue;
             String dbDataStr = dbHistoryFiveMinutely.getValue();
             sensorValues = JSON.parseObject(dbDataStr, HashMap.class);
             Map<String,Object> sensorValue = new HashMap<>();

--
Gitblit v1.8.0