From b2fa4608a2e0abb3d744f4f91bd423380e45f9c4 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 16 十二月 2020 12:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/master'
---
src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
index b4e2ff9..75b9c92 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.storager.jdbc;
import java.util.List;
+import java.util.Map;
import com.genersoft.iot.vmp.common.PageResult;
import com.genersoft.iot.vmp.common.StreamInfo;
@@ -79,9 +80,10 @@
}
@Override
- public PageResult queryChannelsByDeviceId(String deviceId, int page, int count) {
+ public PageResult queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, String online, int page, int count) {
return null;
}
+
@Override
public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
@@ -147,18 +149,68 @@
}
@Override
- public boolean startPlay(String deviceId, String channelId, StreamInfo stream) {
+ public boolean stopPlay(StreamInfo streamInfo) {
return false;
}
@Override
- public boolean stopPlay(String deviceId, String channelId) {
- return false;
- }
-
- @Override
- public StreamInfo queryPlay(String deviceId, String channelId) {
+ public StreamInfo queryPlay(StreamInfo streamInfo) {
return null;
}
+ @Override
+ public PageResult querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, String online, int page, int count) {
+ return null;
+ }
+
+ @Override
+ public void updateCatch() {
+ System.out.println("##################");
+ }
+
+ @Override
+ public void cleanChannelsForDevice(String deviceId) {
+
+ }
+
+ @Override
+ public boolean startPlay(StreamInfo stream) {
+ return false;
+ }
+
+ @Override
+ public StreamInfo queryPlayBySSRC(String ssrc) {
+ return null;
+ }
+
+ @Override
+ public StreamInfo queryPlayByDevice(String deviceId, String code) {
+ return null;
+ }
+
+ @Override
+ public Map<String, StreamInfo> queryPlayByDeviceId(String deviceId) {
+
+ return null;
+ }
+
+ @Override
+ public boolean startPlayback(StreamInfo streamInfo) {
+ return false;
+ }
+
+ @Override
+ public boolean stopPlayback(StreamInfo streamInfo) {
+ return false;
+ }
+
+ @Override
+ public StreamInfo queryPlaybackByDevice(String deviceId, String channelId) {
+ return null;
+ }
+
+ @Override
+ public StreamInfo queryPlaybackBySSRC(String ssrc) {
+ return null;
+ }
}
--
Gitblit v1.8.0