From b888331b6ba56caeeab12a4543fe81bac8854794 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 31 Aug 2021 17:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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