From c1d5a17611252e3b0fe8c159f2dde970e837455c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 05 Jul 2021 14:29:14 +0800
Subject: [PATCH] screen-manage 实时数据界面改为传递code
---
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 8850e00..3f4df42 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
@@ -42,12 +42,12 @@
//������������������������
List<Device> devices = deviceMapper.selectList(queryWrapper);
for (Device device : devices) {
- Map<String, Object> data = getDataFromRedis(device.getMac());
+ Map<String, Object> data = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE_DATA + device.getMac());;
device.setState(Constants.DEVICE_STATE_OFFLINE);
if (data != null && data.containsKey("DataTime")) {
- long time = Long.parseLong(data.get("DataTime").toString());
+ Date time = DateUtils.getDate((String) data.get("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
//���������������������������������
- if (DateUtils.getDateOfMin(new Date(time), 2).getTime() < new Date().getTime()) {
+ if (DateUtils.getDateOfMin(time, 2).getTime() < new Date().getTime()) {
updateDeviceState(device);
}
} else {
@@ -61,9 +61,5 @@
UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", device.getId()).set("state", device.getState());
deviceMapper.update(null, updateWrapper);
- }
-
- private Map<String, Object> getDataFromRedis(String mac) {
- return (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE_DATA + mac);
}
}
--
Gitblit v1.8.0