From ecd14d6757eb12e66d7668eff509c10875abf855 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 15:03:18 +0800
Subject: [PATCH] Merge pull request #578 from urmyfaith/patch-1
---
src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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
index 49ba7b7..61f94c2 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
@@ -1,6 +1,9 @@
package com.genersoft.iot.vmp.service;
+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;
@@ -16,7 +19,7 @@
* @param count
* @return
*/
- PageInfo<GbStream> getAll(Integer page, Integer count);
+ PageInfo<GbStream> getAll(Integer page, Integer count, String platFormId, String catalogId,String query,String mediaServerId);
/**
@@ -30,11 +33,24 @@
* 淇濆瓨鍥芥爣鍏宠仈
* @param gbStreams
*/
- boolean addPlatformInfo(List<GbStream> gbStreams, String platformId);
+ boolean addPlatformInfo(List<GbStream> gbStreams, String platformId, String catalogId);
/**
* 绉婚櫎鍥芥爣鍏宠仈
* @param gbStreams
+ * @param platformId
*/
- boolean delPlatformInfo(List<GbStream> gbStreams);
+ boolean delPlatformInfo(String platformId, List<GbStream> gbStreams);
+
+ 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);
}
--
Gitblit v1.8.0