From f6320c7dd3dfd25e98bb63f41d79a33af5009a93 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:02:16 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
index fa79d69..1395a52 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamProxyService.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.service;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.github.pagehelper.PageInfo;
@@ -12,7 +12,7 @@
* 淇濆瓨瑙嗛浠ｇ悊
* @param param
*/
- String save(StreamProxyItem param);
+ StreamInfo save(StreamProxyItem param);
/**
* 娣诲姞瑙嗛浠ｇ悊鍒皕lm
@@ -52,6 +52,16 @@
boolean start(String app, String stream);
/**
+ * 鏇存柊鐘舵��
+ * @param status 鐘舵��
+ * @param app
+ * @param stream
+ */
+ int updateStatus(boolean status, String app, String stream);
+
+
+
+ /**
* 鍋滅敤鐢ㄨ棰戜唬鐞�
* @param app
* @param stream
@@ -63,5 +73,33 @@
* 鑾峰彇ffmpeg.cmd妯℃澘
* @return
*/
- JSONObject getFFmpegCMDs(IMediaServerItem mediaServerItem);
+ JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem);
+
+ /**
+ * 鏍规嵁app涓巗tream鑾峰彇streamProxy
+ * @return
+ */
+ StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId);
+
+
+ /**
+ * 鏂扮殑鑺傜偣鍔犲叆
+ * @param mediaServerId
+ * @return
+ */
+ void zlmServerOnline(String mediaServerId);
+
+ /**
+ * 鑺傜偣绂荤嚎
+ * @param mediaServerId
+ * @return
+ */
+ void zlmServerOffline(String mediaServerId);
+
+ void clean();
+
+ /**
+ * 鏇存柊浠ｇ悊娴�
+ */
+ boolean updateStreamProxy(StreamProxyItem streamProxyItem);
}
--
Gitblit v1.8.0