From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中,channelid从invite消息的header subject获取,不再从第一行request line获取。原因是和第三方平台对接时,发送的invite消息第一行为国标平台编码而不是设备通道编码,导致报错通道不存在,返回404。

---
 src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java |   45 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
index 899da98..acf0d27 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
@@ -1,11 +1,15 @@
 package com.genersoft.iot.vmp.service;
 
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IStreamPushService {
 
@@ -27,9 +31,44 @@
 
     /**
      * 鑾峰彇
-     * @param page
-     * @param count
+     */
+    PageInfo<StreamPushItem> getPushList(Integer page, Integer count, String query, Boolean pushing, String mediaServerId);
+
+    List<StreamPushItem> getPushList(String mediaSererId);
+
+    StreamPushItem transform(MediaItem item);
+
+    StreamPushItem getPush(String app, String streamId);
+
+    /**
+     * 鍋滄涓�璺帹娴�
+     * @param app 搴旂敤鍚�
+     * @param streamId 娴両D
      * @return
      */
-    PageInfo<StreamPushItem> getPushList(Integer page, Integer count);
+    boolean stop(String app, String streamId);
+
+    /**
+     * 鏂扮殑鑺傜偣鍔犲叆
+     * @param mediaServerId
+     * @return
+     */
+    void zlmServerOnline(String mediaServerId);
+
+    /**
+     * 鑺傜偣绂荤嚎
+     * @param mediaServerId
+     * @return
+     */
+    void zlmServerOffline(String mediaServerId);
+
+    void clean();
+
+    boolean saveToRandomGB();
+
+    void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
+
+    boolean batchStop(List<GbStream> streamPushItems);
+
+    void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll);
 }

--
Gitblit v1.8.0