From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +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 |   10 ++++++++--
 1 files changed, 8 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
index 49ba7b7..3bb964b 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java
@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.service;
 
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.github.pagehelper.PageInfo;
 
@@ -30,11 +31,16 @@
      * 淇濆瓨鍥芥爣鍏宠仈
      * @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, String deviceGBId);
+
+    void sendCatalogMsg(GbStream gbStream, String type);
 }

--
Gitblit v1.8.0