From 28df05e261c0d63050d0bd938b7a6a2c2938b8e9 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 06 八月 2022 09:42:28 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java | 14 +++++++++++---
1 files changed, 11 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..0a39206 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,8 @@
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.github.pagehelper.PageInfo;
import java.util.List;
@@ -16,7 +18,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 +32,17 @@
* 淇濆瓨鍥芥爣鍏宠仈
* @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);
}
--
Gitblit v1.8.0