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 |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 110 insertions(+), 10 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 59ecba0..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,7 +1,12 @@
 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;
+import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
@@ -17,7 +22,17 @@
 @Component("jdbcStorager")
 public class VideoManagerJdbcStoragerImpl implements IVideoManagerStorager {
 
-	/**   
+	@Override
+	public boolean updateMediaInfo(MediaServerConfig mediaServerConfig) {
+		return false;
+	}
+
+	@Override
+	public MediaServerConfig getMediaInfo() {
+		return null;
+	}
+
+	/**
 	 * 鏍规嵁璁惧ID鍒ゆ柇璁惧鏄惁瀛樺湪
 	 * 
 	 * @param deviceId 璁惧ID
@@ -40,18 +55,17 @@
 		// TODO Auto-generated method stub
 		return false;
 	}
-	
-	/**   
-	 * 瑙嗛璁惧鏇存柊
-	 * 
-	 * @param device 璁惧瀵硅薄
-	 * @return true锛氭洿鏂版垚鍔�  false锛氭洿鏂板け璐�
-	 */  
+
 	@Override
-	public boolean update(Device device) {
-		// TODO Auto-generated method stub
+	public boolean updateDevice(Device device) {
 		return false;
 	}
+
+	@Override
+	public void updateChannel(String deviceId, DeviceChannel channel) {
+
+	}
+
 
 	/**   
 	 * 鑾峰彇璁惧
@@ -62,6 +76,27 @@
 	@Override
 	public Device queryVideoDevice(String deviceId) {
 		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public PageResult queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, String online, int page, int count) {
+		return null;
+	}
+
+
+	@Override
+	public List<DeviceChannel> queryChannelsByDeviceId(String deviceId) {
+		return null;
+	}
+
+	@Override
+	public DeviceChannel queryChannel(String deviceId, String channelId) {
+		return null;
+	}
+
+	@Override
+	public PageResult<Device> queryVideoDeviceList(String[] deviceIds, int page, int count) {
 		return null;
 	}
 
@@ -113,4 +148,69 @@
 		return false;
 	}
 
+	@Override
+	public boolean stopPlay(StreamInfo streamInfo) {
+		return false;
+	}
+
+	@Override
+	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