From f09f1c9a2a3bb53c8d25ad5d82722129b0578be4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 五月 2022 18:23:43 +0800
Subject: [PATCH] 换种写法

---
 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java |   32 ++++----------------------------
 1 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
index 11d8b84..d94669b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -5,7 +5,6 @@
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
 import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
-import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
 import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
 import com.github.pagehelper.PageInfo;
 
@@ -26,22 +25,6 @@
 	 * @return true:瀛樺湪  false锛氫笉瀛樺湪
 	 */
 	public boolean exists(String deviceId);
-	
-	/**   
-	 * 瑙嗛璁惧鍒涘缓
-	 * 
-	 * @param device 璁惧瀵硅薄
-	 * @return true锛氬垱寤烘垚鍔�  false锛氬垱寤哄け璐�
-	 */
-	public boolean create(Device device);
-	
-	/**   
-	 * 瑙嗛璁惧鏇存柊
-	 * 
-	 * @param device 璁惧瀵硅薄
-	 * @return true锛氬垱寤烘垚鍔�  false锛氬垱寤哄け璐�
-	 */
-	public boolean updateDevice(Device device);
 
 	/**
 	 * 娣诲姞璁惧閫氶亾
@@ -90,16 +73,10 @@
 	 * @param count 姣忛〉鏁伴噺
 	 * @return
 	 */
-	public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count);
+	public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count);
 	
 	public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit);
 
-	/**
-	 *  鑾峰彇鏌愪釜璁惧鐨勯�氶亾鏍�
-	 * @param deviceId 璁惧ID
-	 * @return
-	 */
-	List<DeviceChannelTree> tree(String deviceId);
 
 	/**
 	 * 鑾峰彇鏌愪釜璁惧鐨勯�氶亾鍒楄〃
@@ -180,7 +157,7 @@
 	 * @param count
 	 * @return
 	 */
-	PageInfo querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, String online, int page, int count);
+	PageInfo querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, Boolean online, int page, int count);
 
 
 	/**
@@ -285,7 +262,7 @@
 	 * @param startTime
 	 * @param endTime
 	 */
-	public List<MobilePosition> queryMobilePositions(String deviceId, String startTime, String endTime);
+	public List<MobilePosition> queryMobilePositions(String deviceId, String channelId, String startTime, String endTime);
 
 	/**
 	 * 鏌ヨ鏈�鏂扮Щ鍔ㄤ綅缃�
@@ -401,10 +378,9 @@
 	 * 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠g悊鍒楄〃
 	 * @param id 濯掍綋ID
 	 * @param enable 鍚敤/涓嶅惎鐢�
-	 * @param status 鐘舵��
 	 * @return
 	 */
-	List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id,  boolean enable, boolean status);
+	List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id,  boolean enable);
 
 	/**
 	 * 鏍规嵁閫氶亾ID鑾峰彇鍏舵墍鍦ㄨ澶�

--
Gitblit v1.8.0