From 625842fd0d53909066b37febcbe5d12ae53635ed Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期日, 10 一月 2021 21:38:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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 b783238..546a3e4 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
@@ -9,6 +9,7 @@
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
+import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +17,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import org.springframework.transaction.annotation.Transactional;
/**
* @Description:瑙嗛璁惧鏁版嵁瀛樺偍-jdbc瀹炵幇
@@ -270,4 +272,20 @@
public void outlineForAllParentPlatform() {
platformMapper.outlineForAllParentPlatform();
}
+
+
+ @Override
+ public PageInfo<ChannelReduce> queryChannelListInAll(int page, int count, String query, Boolean online,
+ Boolean channelType, String parentChannelId) {
+ PageHelper.startPage(page, count);
+ List<ChannelReduce> all = deviceChannelMapper.queryChannelListInAll(query, online, channelType, parentChannelId);
+ return new PageInfo<>(all);
+ }
+
+
+ @Transactional
+ @Override
+ public int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces) {
+ return 0;
+ }
}
--
Gitblit v1.8.0