From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 162 ++++++++++++------------------------------------------
1 files changed, 36 insertions(+), 126 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
old mode 100644
new mode 100755
index d3a9ae9..b0ff011
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java
@@ -2,10 +2,10 @@
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-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.gb28181.platform.bean.ChannelReduce;
+import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -25,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);
/**
* 寮�濮嬫挱鏀�
@@ -89,9 +57,9 @@
* @param count 姣忛〉鏁伴噺
* @return
*/
- public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count);
+ public PageInfo<DeviceChannel> 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);
+ public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit);
/**
@@ -100,7 +68,7 @@
* @param deviceId 璁惧ID
* @return
*/
- public List<DeviceChannel> queryChannelsByDeviceId(String deviceId);
+ public List<DeviceChannel> queryChannelsByDeviceId(String deviceId,Boolean online,List<String> channelIds);
public List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId);
/**
@@ -123,45 +91,15 @@
* @param count 姣忛〉鏁伴噺
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
- public PageInfo<Device> queryVideoDeviceList(int page, int count);
+ public PageInfo<Device> queryVideoDeviceList(int page, int count,Boolean online);
/**
* 鑾峰彇澶氫釜璁惧
*
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
- public List<Device> queryVideoDeviceList();
+ public List<Device> queryVideoDeviceList(Boolean online);
- /**
- * 鍒犻櫎璁惧
- *
- * @param deviceId 璁惧ID
- * @return true锛氬垹闄ゆ垚鍔� false锛氬垹闄ゅけ璐�
- */
- public boolean delete(String deviceId);
-
- /**
- * 鏇存柊璁惧鍦ㄧ嚎
- *
- * @param deviceId 璁惧ID
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- public boolean online(String deviceId);
-
- /**
- * 鏇存柊璁惧绂荤嚎
- *
- * @param deviceId 璁惧ID
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- public boolean outline(String deviceId);
-
- /**
- * 鏇存柊鎵�鏈夎澶囩绾�
- *
- * @return true锛氭洿鏂版垚鍔� false锛氭洿鏂板け璐�
- */
- public boolean outlineForAll();
/**
@@ -202,15 +140,6 @@
*/
boolean deleteParentPlatform(ParentPlatform parentPlatform);
-
- /**
- * 鍒嗛〉鑾峰彇涓婄骇骞冲彴
- * @param page
- * @param count
- * @return
- */
- PageInfo<ParentPlatform> queryParentPlatformList(int page, int count);
-
/**
* 鑾峰彇鎵�鏈夊凡鍚敤鐨勫钩鍙�
* @return
@@ -240,13 +169,6 @@
List<DeviceChannelInPlatform> queryChannelListInParentPlatform(String platformId);
- /**
- * 鏇存柊涓婄骇骞冲彴鐨勯�氶亾淇℃伅
- * @param platformId
- * @param channelReduces
- * @return
- */
- int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces, String catalogId);
/**
* 绉婚櫎涓婄骇骞冲彴鐨勯�氶亾淇℃伅
@@ -264,7 +186,13 @@
Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId);
-
+ /**
+ * 閽堝deviceinfo鎸囦护鐨勬煡璇㈡帴鍙�
+ * @param platformId 骞冲彴id
+ * @param channelId 閫氶亾id
+ * @return 璁惧淇℃伅
+ */
+ Device queryDeviceInfoByPlatformIdAndChannelId(String platformId, String channelId);
/**
* 娣诲姞Mobile Position璁惧绉诲姩浣嶇疆
* @param mobilePosition
@@ -291,20 +219,6 @@
* @param deviceId
*/
public int clearMobilePositionsByDeviceId(String deviceId);
-
- /**
- * 鏂板浠ｇ悊娴�
- * @param streamProxyDto
- * @return
- */
- public boolean addStreamProxy(StreamProxyItem streamProxyDto);
-
- /**
- * 鏇存柊浠ｇ悊娴�
- * @param streamProxyDto
- * @return
- */
- public boolean updateStreamProxy(StreamProxyItem streamProxyDto);
/**
* 绉婚櫎浠ｇ悊娴�
@@ -350,19 +264,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);
/**
* 绉婚櫎鍗曚釜鎺ㄦ祦
@@ -371,22 +273,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);
@@ -432,6 +330,8 @@
*/
boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+ boolean updateChannels(String deviceId, List<DeviceChannel> deviceChannelList);
+
/**
* 鑾峰彇鐩綍淇℃伅
* @param platformId
@@ -442,15 +342,15 @@
int addCatalog(PlatformCatalog platformCatalog);
- PlatformCatalog getCatalog(String id);
+ PlatformCatalog getCatalog(String platformId, String id);
- int delCatalog(String id);
+ int delCatalog(String platformId, String id);
int updateCatalog(PlatformCatalog platformCatalog);
int setDefaultCatalog(String platformId, String catalogId);
- List<PlatformCatalog> queryCatalogInPlatform(String serverGBId);
+ List<DeviceChannel> queryCatalogInPlatform(String serverGBId);
int delRelation(PlatformCatalog platformCatalog);
@@ -470,5 +370,15 @@
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);
+
+ List<DeviceChannelExtend> queryChannelsByDeviceId(String serial, List<String> channelIds, Boolean online);
+
+ List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel();
+
+ List<Device> queryDeviceWithAsMessageChannel();
}
--
Gitblit v1.8.0