From f2f77f203fd6b054197ecaba0517a159e8b3ac8f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 30 Oct 2023 15:48:24 +0800
Subject: [PATCH] fix：补偿0问题修改
---
screen-manage/src/main/java/com/moral/api/util/CacheUtils.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java b/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
index 5f292cf..cecec02 100644
--- a/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
+++ b/screen-manage/src/main/java/com/moral/api/util/CacheUtils.java
@@ -17,6 +17,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
@@ -82,14 +83,27 @@
public static void refreshDeviceAlarmInfo() {
- //������������
- redisTemplate.delete(RedisConstants.DEVICE_INFO);
+
+ refreshDeviceAlarmInfo(null);
+
+
+ }
+ public static void refreshDeviceAlarmInfo(String mac){
+ if(StringUtils.isEmpty(mac)){
+ //������������
+ redisTemplate.delete(RedisConstants.DEVICE_INFO);
+ }else {
+ redisTemplate.opsForHash().delete(RedisConstants.DEVICE_INFO,mac);
+ }
//������������������
- List<Device> devices = deviceMapper.queryDeviceUnitAlarmInfo();
+ List<Device> devices = deviceMapper.queryDeviceUnitAlarmInfo(mac);
+
Map<String, SysDictData> unitMap = sysDictDataService.getDictDatasByType("unit");
//���������������������������������������������
Map<String,Device> result = new HashMap<>();
+ int i = 0;
for (Device device : devices) {
+ System.out.println(">>>>>>>>>>>:"+(i++));
Version version = device.getVersion();
List<Sensor> sensors = version.getSensors();
for (Sensor sensor : sensors) {
@@ -130,6 +144,8 @@
redisTemplate.opsForHash().putAll(RedisConstants.DEVICE_INFO,result);
}
+
+
public static void refreshSpecialDeviceAlarmInfo() {
//������������
redisTemplate.delete(RedisConstants.SPECIAL_DEVICE_INFO);
--
Gitblit v1.8.0