From 2b2efb59a61a54b398f8f6c9263f37d41c18e65c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 一月 2024 14:56:11 +0800
Subject: [PATCH] 修复多个推流推送到上级是不完整的问题，修改平台注销时不删除自己模拟的订阅信息
---
src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
old mode 100644
new mode 100755
index 0effa43..43f1a8a
--- a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
@@ -2,6 +2,8 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.github.pagehelper.PageInfo;
import java.util.List;
@@ -17,7 +19,7 @@
* @param count
* @return
*/
- PageInfo<GbStream> getAll(Integer page, Integer count, String platFormId);
+ PageInfo<GbStream> getAll(Integer page, Integer count, String platFormId, String catalogId,String query,String mediaServerId);
/**
@@ -40,8 +42,33 @@
*/
boolean delPlatformInfo(String platformId, List<GbStream> gbStreams);
- DeviceChannel getDeviceChannelListByStream(GbStream gbStream, String catalogId, String deviceGBId);
+ DeviceChannel getDeviceChannelListByStream(GbStream gbStream, String catalogId, ParentPlatform platform);
void sendCatalogMsg(GbStream gbStream, String type);
void sendCatalogMsgs(List<GbStream> gbStreams, String type);
+
+ /**
+ * 淇敼gbId鎴杗ame
+ * @param streamPushItemForUpdate
+ * @return
+ */
+ int updateGbIdOrName(List<StreamPushItem> streamPushItemForUpdate);
+
+ DeviceChannel getDeviceChannelListByStreamWithStatus(GbStream gbStream, String catalogId, ParentPlatform platform);
+
+ /**
+ * 鏌ヨ鎵�鏈夋湭鍒嗛厤鐨勯�氶亾
+ * @param platformId
+ * @return
+ */
+ List<GbStream> getAllGBChannels(String platformId);
+
+ /**
+ * 绉婚櫎鎵�鏈夊叧鑱旂殑閫氶亾
+ * @param platformId
+ * @param catalogId
+ */
+ void delAllPlatformInfo(String platformId, String catalogId);
+
+ List<GbStream> getGbChannelWithGbid(String gbId);
}
--
Gitblit v1.8.0