From 2cf0253cf25e8e74958075eb3d1a1b8eac70356d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 09 Aug 2021 08:50:19 +0800
Subject: [PATCH] 去除员工管理菜单。角色分配唯一
---
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