From 059a5a678ab21738c3fecb9e2bd1e2dc47220a4f Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 07 一月 2021 15:31:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 92de14a..21dd031 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -33,6 +33,7 @@
@Autowired
private ParentPlatformMapper platformMapper;
+
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -110,8 +111,6 @@
List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
return new PageInfo<>(all);
}
-
-
@Override
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
@@ -252,5 +251,13 @@
return platformMapper.getParentPlatById(platformGbId);
}
+ @Override
+ public List<ParentPlatform> queryEnableParentPlatformList(boolean enable) {
+ return platformMapper.getEnableParentPlatformList(enable);
+ }
+ @Override
+ public void outlineForAllParentPlatform() {
+ platformMapper.outlineForAllParentPlatform();
+ }
}
--
Gitblit v1.8.0