From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期六, 14 十月 2023 16:31:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java b/ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java index 436fe72..5d04ef0 100644 --- a/ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java +++ b/ard-work/src/main/java/com/ruoyi/media/service/IMediaService.java @@ -1,5 +1,6 @@ package com.ruoyi.media.service; +import com.dtflys.forest.annotation.Var; import com.ruoyi.media.domain.*; import java.lang.reflect.MalformedParameterizedTypeException; @@ -11,12 +12,13 @@ * 澧炲姞璺緞 * name 鍚嶇О * rtspPath rtsp鍦板潃 - * mode 妯″紡锛氬疄鏃�/鎸夐渶 + * mode 妯″紡锛歡pu纭В鐮�/cpu杞В鐮� * isCode 鏄惁杞爜 * 鍒樿嫃涔� * 2023/8/12 13:56:52 */ - Map<String,String> addPath(String name, String sourceUrl, String mode, String isCode); + Map<String, String> addPath(String name, String sourceUrl, String mode, String isCode); + /** * 淇敼璺緞 * name 鍚嶇О @@ -26,13 +28,17 @@ * 鍒樿嫃涔� * 2023/8/12 13:56:52 */ - Map<String,String> editPath(String name, String sourceUrl, String mode, String isCode); + Map<String, String> editPath(String name, String sourceUrl, String mode, String isCode); StreamInfo getPathInfo(String name); void removePath(String[] names); + void removePath(String name); + List<StreamInfo> paths(); + + List<String> getNameList(); RtspSession getRtspSessionById(String sessionId); @@ -49,4 +55,11 @@ Boolean kickRtmpSession(String sessionId); Boolean kickWebrtcSession(String sessionId); + + /** + * 閰嶇疆娴佸獟浣撳弬鏁� + * 鍒樿嫃涔� + * 2023/10/13 15:17:57 + */ + public String setConfig(Config config); } -- Gitblit v1.9.3