From ed1fe4b9388cfa9c1cf691f840afceddce8c7bfd Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 17 十二月 2020 15:42:29 +0800
Subject: [PATCH] 与主线同步，修复zlm在docker时代理错误
---
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
index 0e21167..99c7f06 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
@@ -555,12 +555,17 @@
List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
deviceId,
code));
+ if (playLeys == null || playLeys.size() == 0) {
+ playLeys = redis.scan(String.format("%S_*_*_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ deviceId));
+ }
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
}
@Override
public boolean updateParentPlatform(ParentPlatform parentPlatform) {
+
// 瀛樺偍device
return redis.set(VideoManagerConstants.PLATFORM_PREFIX + parentPlatform.getDeviceGBId(), parentPlatform);
}
@@ -587,4 +592,9 @@
pageResult.setData(resultData);
return pageResult;
}
+
+ @Override
+ public ParentPlatform queryParentPlatById(String platformGbId) {
+ return (ParentPlatform)redis.get(VideoManagerConstants.PLATFORM_PREFIX + platformGbId);
+ }
}
--
Gitblit v1.8.0