From 371a381267699280f45748c13ed42faba66b6577 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Jul 2021 17:34:32 +0800
Subject: [PATCH] update redis key
---
screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java | 2 +-
screen-job/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 2 +-
screen-common/src/main/java/com/moral/constant/RedisConstants.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/RedisConstants.java b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
index 25c36a2..e2b5bff 100644
--- a/screen-common/src/main/java/com/moral/constant/RedisConstants.java
+++ b/screen-common/src/main/java/com/moral/constant/RedisConstants.java
@@ -49,9 +49,9 @@
public static final String ADJUST = "adjust_";
/*
- * redis���������������������key
+ * redis������������key
* */
- public static final String DEVICE_DATA = "data";
+ public static final String DATA_SECOND = "data_second";
/*
* redis���aqi������key
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);
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
index 4d1f804..34ebc45 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaConsumer.java
@@ -133,7 +133,7 @@
//������������
data = deviceService.adjustDeviceData(data);
//������redis
- redisTemplate.opsForHash().put(RedisConstants.DEVICE_DATA, mac, data);
+ redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data);
//���������������������������
deviceService.judgeDeviceState(data);
ack.acknowledge();
--
Gitblit v1.8.0