From 8b6449ce3ac8eb4a0f59f3a6e3974d9190dcd133 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 29 八月 2022 09:55:09 +0800
Subject: [PATCH] 升级版本号
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 107 ++++++++---------------------------------------------
1 files changed, 17 insertions(+), 90 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..b2c1e1b 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,38 +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);
-
- /**
- * 娣诲姞璁惧閫氶亾
- *
- * @param deviceId 璁惧id
- * @param channel 閫氶亾
- */
- public void updateChannel(String deviceId, DeviceChannel channel);
-
- /**
- * 鎵归噺娣诲姞璁惧閫氶亾
- *
- * @param deviceId 璁惧id
- * @param channels 澶氫釜閫氶亾
- */
- public int updateChannels(String deviceId, List<DeviceChannel> channels);
/**
* 寮�濮嬫挱鏀�
@@ -90,16 +57,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 +141,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);
/**
@@ -247,13 +208,6 @@
List<DeviceChannelInPlatform> queryChannelListInParentPlatform(String platformId);
- /**
- * 鏇存柊涓婄骇骞冲彴鐨勯�氶亾淇℃伅
- * @param platformId
- * @param channelReduces
- * @return
- */
- int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces, String catalogId);
/**
* 绉婚櫎涓婄骇骞冲彴鐨勯�氶亾淇℃伅
@@ -285,7 +239,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);
/**
* 鏌ヨ鏈�鏂扮Щ鍔ㄤ綅缃�
@@ -298,20 +252,6 @@
* @param deviceId
*/
public int clearMobilePositionsByDeviceId(String deviceId);
-
- /**
- * 鏂板浠ｇ悊娴�
- * @param streamProxyDto
- * @return
- */
- public boolean addStreamProxy(StreamProxyItem streamProxyDto);
-
- /**
- * 鏇存柊浠ｇ悊娴�
- * @param streamProxyDto
- * @return
- */
- public boolean updateStreamProxy(StreamProxyItem streamProxyDto);
/**
* 绉婚櫎浠ｇ悊娴�
@@ -357,19 +297,7 @@
* @param platformId
* @return
*/
- List<GbStream> queryGbStreamListInPlatform(String platformId);
-
- /**
- * 鎵归噺鏇存柊鎺ㄦ祦鍒楄〃
- * @param streamPushItems
- */
- void updateMediaList(List<StreamPushItem> streamPushItems);
-
- /**
- * 鏇存柊鍗曚釜鎺ㄦ祦
- * @param streamPushItem
- */
- void updateMedia(StreamPushItem streamPushItem);
+ List<DeviceChannel> queryGbStreamListInPlatform(String platformId);
/**
* 绉婚櫎鍗曚釜鎺ㄦ祦
@@ -378,22 +306,18 @@
*/
int removeMedia(String app, String stream);
-
- /**
- * 娓呯┖鎺ㄦ祦鍒楄〃
- */
- void clearMediaList();
-
/**
* 璁剧疆娴佺绾�
- * @param app
- * @param streamId
*/
- int mediaOutline(String app, String streamId);
+ int mediaOffline(String app, String streamId);
+
+ /**
+ * 璁剧疆娴佷笂绾�
+ */
+ int mediaOnline(String app, String streamId);
/**
* 璁剧疆骞冲彴鍦ㄧ嚎/绂荤嚎
- * @param online
*/
void updateParentPlatformStatus(String platformGbID, boolean online);
@@ -401,10 +325,9 @@
* 鏍规嵁濯掍綋ID鑾峰彇鍚敤/涓嶅惎鐢ㄧ殑浠ｇ悊鍒楄〃
* @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鑾峰彇鍏舵墍鍦ㄨ澶�
@@ -458,7 +381,7 @@
int setDefaultCatalog(String platformId, String catalogId);
- List<PlatformCatalog> queryCatalogInPlatform(String serverGBId);
+ List<DeviceChannel> queryCatalogInPlatform(String serverGBId);
int delRelation(PlatformCatalog platformCatalog);
@@ -478,5 +401,9 @@
List<ChannelSourceInfo> getChannelSource(String platformId, String gbId);
- void updateChannelPotion(String deviceId, String channelId, double longitude, double latitude);
+ void updateChannelPosition(DeviceChannel deviceChannel);
+
+ void cleanContentForPlatform(String serverGBId);
+
+ List<DeviceChannel> queryChannelWithCatalog(String serverGBId);
}
--
Gitblit v1.8.0