From 578b6efb20248f244ce7bd46c26361c79e5270f1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Jul 2021 13:59:02 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index b66f7b9..eae61a6 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -43,7 +43,7 @@
//������������������������
List<Device> devices = deviceMapper.selectList(queryWrapper);
for (Device device : devices) {
- Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE_DATA, device.getMac());
+ Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DATA_SECOND, device.getMac());
device.setState(Constants.DEVICE_STATE_OFFLINE);
if (data != null && data.containsKey("DataTime")) {
Date time = DateUtils.getDate((String) data.get("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
--
Gitblit v1.8.0