From dab37ef8c41decd4a26468ebd9fe77093051b996 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 29 八月 2023 17:12:29 +0800
Subject: [PATCH] 更新流媒体mediaMTX版本V1.0.0

---
 ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java |  370 +++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 245 insertions(+), 125 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
index b28201b..c9bc8b8 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaService.java
@@ -2,22 +2,25 @@
 
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.media.domain.*;
+import com.ruoyi.media.mapper.VtduMapper;
 import com.ruoyi.media.service.IMediaService;
 import com.ruoyi.utils.forest.MediaClient;
 import com.ruoyi.utils.tools.ArdTool;
+import com.ruoyi.utils.process.CmdUtils;
 import com.sun.jna.Platform;
-import io.minio.messages.Item;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -30,58 +33,99 @@
  * @Version: 1.0
  **/
 @Service
-@Slf4j
+@Slf4j(topic = "cmd")
 public class MediaService implements IMediaService {
-
+    @Resource
+    VtduMapper vtduMapper;
     @Resource
     MediaClient mediaClient;
     @Value("${mediamtx.host}")
     String mediamtxHost;
+    @Value("${mediamtx.enabled}")
+    Boolean mediamtxEnabled;
+    @Value("${mediamtx.software_decoding}")
+    Boolean softwareDecoding;
+
+    String processName = "mediamtx.exe";
 
     @PostConstruct
     public void initMediaMtx() {
-        if (Platform.isWindows()) {
-            String exePath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.exe";
-            String ymlPath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.yml";
-            try {
-                // 鏋勫缓鍚姩鍛戒护锛屼娇鐢╟md /c start鍛戒护鏉ュ惎鍔ㄥ彲鎵ц绋嬪簭骞舵樉绀哄懡浠ゆ彁绀虹绐楀彛
-                String[] cmd = {"cmd", "/c", "start", exePath,ymlPath};
-                ProcessBuilder processBuilder = new ProcessBuilder(cmd);
-                processBuilder.redirectErrorStream(true); // 灏嗛敊璇緭鍑洪噸瀹氬悜鍒版爣鍑嗚緭鍑�
-                Process process = processBuilder.start();
-                // 濡傛灉浣犳兂绛夊緟绋嬪簭瀹屾垚
-                int exitCode = process.waitFor();
-            } catch (IOException | InterruptedException e) {
-                e.printStackTrace();
+        if (mediamtxEnabled) {
+            if (Platform.isWindows()) {
+                String exePath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.exe";
+                String ymlPath = System.getProperty("user.dir") + File.separator + "lib" + File.separator + "mediamtx" + File.separator + "mediamtx.yml";
+
+                List<String> cmd = new ArrayList<>();
+                cmd.add(exePath);
+                cmd.add(ymlPath);
+                if (CmdUtils.isProcessRunning(processName)) {
+                    // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
+                    CmdUtils.stopProcess(processName);
+                }
+                // 鍚姩鍚庡彴杩涚▼
+                CmdUtils.commandStart(processName, cmd, null);
+                // 鍚姩cmd绐楀彛
+//            String[] command = {"cmd","/c","start",exePath,ymlPath};
+//            CmdUtils.commandStart(command);
+            }
+        }
+        List<StreamInfo> paths = paths();
+        for(StreamInfo path:paths)
+        {
+            mediaClient.removePath(path.getName());
+        }
+        List<Vtdu> vtduList = vtduMapper.selectVtduList(new Vtdu());
+        for (Vtdu v : vtduList) {
+            addPath(v.getName(), v.getRtspUrl(), v.getCodeType(), v.getIsCode());
+        }
+    }
+
+    @PreDestroy
+    public void destroyMediaMtx() {
+        if (mediamtxEnabled) {
+            log.info("閿�姣乵ediaMtx");
+            if (CmdUtils.isProcessRunning(processName)) {
+                // 杩涚▼宸茬粡鍦ㄨ繍琛岋紝缁撴潫璇ヨ繘绋�
+                CmdUtils.stopProcess(processName);
             }
         }
     }
 
     @Override
-    public String addPath(String name, String rtspPath, String mode) {
-        String rtspUrl = "rtsp://" + mediamtxHost + ":7554/";
+    public String addPath(String name, String rtspPath, String mode, String isCode) {
+        String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
         Conf mediaInfo = new Conf();
+        String rootPath = System.getProperty("user.dir").replaceAll("\\\\", "/");
         //-vcodec libx264 //鎸囧畾瑙嗛缂栫爜鍣ㄤ负 libx264锛屼娇鐢� H.264 缂栫爜鏍煎紡杩涜瑙嗛鍘嬬缉
         //-preset ultrafast  //--preset鐨勫弬鏁颁富瑕佽皟鑺傜紪鐮侀�熷害鍜岃川閲忕殑骞宠 锛屾湁ultrafast锛堣浆鐮侀�熷害鏈�蹇紝瑙嗛寰�寰�涔熸渶妯$硦锛夈�乻uperfast銆乿eryfast銆乫aster銆乫ast銆乵edium銆乻low銆乻lower銆乿eryslow銆乸lacebo杩�10涓�夐」锛屼粠蹇埌鎱�
         //-r 25 //璁剧疆杈撳嚭瑙嗛鐨勫抚鐜囦负 25 甯�/绉�
         //-rtsp_transport tcp //杩欎釜閫夐」鍛婅瘔 FFmpeg 浣跨敤 TCP 浣滀负 RTSP 鐨勪紶杈撳崗璁�
         //-threads 4: 鎸囧畾瑕佷娇鐢ㄧ殑绾跨▼鏁颁负 4銆�//杩欏厑璁� FFmpeg 鍦ㄥ鏍稿鐞嗗櫒涓婁娇鐢ㄥ涓嚎绋嬫潵杩涜瑙嗛缂栫爜锛屼互鍔犲揩閫熷害銆�
         // -i //鐢ㄤ簬鎸囧畾杈撳叆濯掍綋鏂囦欢鎴栬緭鍏ユ祦鐨勫湴鍧�
+        // -bf 0 绂佺敤B甯э紝鍥犱负webrtc鍦ㄧ綉椤佃皟鐢ㄦ椂鎺у埗鍙颁竴鐩磋緭鍑� WebRTC doesn鈥檛 support H264 streams with B-frames
         //-f rtsp //杩欎釜閫夐」鍛婅瘔 FFmpeg 杈撳嚭涓� RTSP 鏍煎紡銆�
         //CPU杞В鐮佺紪鐮�
-        String cmd = "ffmpeg -rtsp_transport tcp -i \"" + rtspPath + "\" -vcodec libx264 -preset:v ultrafast -r 25 -threads 4  -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+        //String cmd = rootPath + "/lib/mediamtx/" +"ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -threads 4  -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
         //GPU纭В鐮佺紪鐮� -hwaccel cuvid -c:v h264_cuvid  浣跨敤cuda瑙g爜   -c:v h264_nvenc 浣跨敤cuda缂栫爜
-        //String cmd = "ffmpeg -hwaccel cuvid -c:v h264_cuvid  -rtsp_transport udp  -i \"" + rtspPath + "\" -c:v h264_nvenc  -r 25 -threads 4  -b:v 4096k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
-
-        if (mode.equals("1")) {
-            mediaInfo.setRunondemand(cmd);
-            mediaInfo.setRunondemandrestart(true);
+        //String cmd = rootPath  + "/lib/mediamtx/" + "ffmpeg -hwaccel cuvid -c:v h264_cuvid  -rtsp_transport udp  -i " + rtspPath + " -c:v h264_nvenc  -r 25 -threads 4  -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+        if (isCode.equals("1")) {
+            String cmd = rootPath + "/lib/mediamtx/" + "ffmpeg -rtsp_transport tcp -i " + rtspPath + " -vcodec libx264 -preset:v ultrafast -r 25 -threads 4  -b:v 2048k -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+            if (!softwareDecoding) {
+                cmd = rootPath + "/lib/mediamtx/" + "ffmpeg -hwaccel cuvid -c:v h264_cuvid  -rtsp_transport udp  -i " + rtspPath + " -c:v h264_nvenc  -r 25 -threads 4  -b:v 2048k -bf 0 -f rtsp rtsp://localhost:$RTSP_PORT/$MTX_PATH";
+            }
+            if (mode.equals("1")) {
+                mediaInfo.setRunondemand(cmd);
+                mediaInfo.setRunondemandrestart(true);
+            } else {
+                mediaInfo.setRunoninit(cmd);
+                mediaInfo.setRunoninitrestart(true);
+            }
         } else {
-            mediaInfo.setRunoninit(cmd);
-            mediaInfo.setRunoninitrestart(true);
+            mediaInfo.setSource(rtspPath);
         }
+        mediaInfo.setSourceprotocol("udp");
         mediaClient.addPath(name, mediaInfo);
-        return rtspUrl + name;
+        return rtspUrl;
     }
 
     @Override
@@ -105,6 +149,10 @@
         Matcher matcher = pattern.matcher(runoninit);
         if (matcher.find()) {
             info.setRtspSource(matcher.group());
+            info.setIsCode("1");
+        } else {
+            info.setRtspSource(item.getConf().getSource());
+            info.setIsCode("0");
         }
         return info;
     }
@@ -118,7 +166,6 @@
 
     @Override
     public List<StreamInfo> paths() {
-
         String list = mediaClient.paths();
         JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
         List<Items> items = jsonsRoot.getItems();
@@ -135,7 +182,7 @@
                 info.setMode("1");
             } else {
                 runoninit = item.getConf().getRunoninit();
-                info.setMode("2");
+                info.setMode("0");
             }
             //RTSP婧愬湴鍧�
             String regex = "rtsp://[^\\s\"]+";
@@ -143,6 +190,10 @@
             Matcher matcher = pattern.matcher(runoninit);
             if (matcher.find()) {
                 info.setRtspSource(matcher.group());
+                info.setIsCode("1");
+            } else {
+                info.setRtspSource(item.getConf().getSource());
+                info.setIsCode("0");
             }
             //浼犺緭鍗忚
             regex = "-rtsp_transport\\s+(\\w+)";
@@ -157,19 +208,6 @@
         return pathInfoList;
     }
 
-    @Override
-    public List<Items> rtspconns() {
-        String list = mediaClient.rtspconns();
-        JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
-        return jsonsRoot.getItems();
-    }
-
-    @Override
-    public List<Items> rtspsessions() {
-        String list = mediaClient.rtspsessions();
-        JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
-        return jsonsRoot.getItems();
-    }
 
     @Override
     public RtspSession getRtspSessionById(String sessionId) {
@@ -179,38 +217,24 @@
     }
 
     @Override
-    public List<RtspSession> getPushStreams() {
-        List<RtspSession> rtspSessions = new ArrayList<>();
-
-        String list = mediaClient.paths();
-        JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
-        List<Items> items = jsonsRoot.getItems();
-        for (Items item : items) {
-            Source source = item.getSource();
-            RtspSession rtspSession = getRtspSessionById(source.getId());
-            rtspSession.setName(item.getName());
-            rtspSessions.add(rtspSession);
-        }
-        return rtspSessions;
+    public WebrtcSession getWebrtcSessionById(String sessionId) {
+        String list = mediaClient.getWebrtcsessionById(sessionId);
+        WebrtcSession webrtcSession = JSONObject.parseObject(list, WebrtcSession.class);
+        return webrtcSession;
     }
 
     @Override
-    public List<RtspSession> getPullStreams() {
-        List<RtspSession> rtspSessions = new ArrayList<>();
-        String list = mediaClient.paths();
-        JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
-        List<Items> items = jsonsRoot.getItems();
-        for (Items item : items) {
-            List<Readers> readers = item.getReaders();
-            for (Readers reader : readers) {
-                RtspSession rtspSession = getRtspSessionById(reader.getId());
-                rtspSession.setName(item.getName());
-                rtspSessions.add(rtspSession);
-            }
-        }
-        return rtspSessions;
+    public RtmpSession getRtmpSessionById(String sessionId) {
+        String list = mediaClient.getRtmpsessionById(sessionId);
+        RtmpSession rtmpSession = JSONObject.parseObject(list, RtmpSession.class);
+        return rtmpSession;
     }
 
+    /**
+     * 鑾峰彇鎺ㄦ祦鍒楄〃
+     * 鍒樿嫃涔�
+     * 2023/8/29 9:37:05
+     */
     @Override
     public List<StreamInfo> getPushStreamList() {
         List<StreamInfo> PushStreamInfoList = new ArrayList<>();
@@ -222,26 +246,40 @@
             //ID
             String name = item.getName();
             info.setName(name);
+            //RTMP鎾斁鍦板潃
+            String rtmpUrl = "rtmp://" + mediamtxHost + ":1935/" + name;
+            info.setRtmpUrl(rtmpUrl);
             //RTSP鎾斁鍦板潃
             String rtspUrl = "rtsp://" + mediamtxHost + ":7554/" + name;
             info.setRtspUrl(rtspUrl);
+            //WEBRTC鎾斁鍦板潃
+            String webrtcUrl = "http://" + mediamtxHost + ":8889/" + name;
+            info.setWebrtcUrl(webrtcUrl);
             Source source = item.getSource();
-            if (source == null) {
-                continue;
+            if (source == null || source.getId().equals("")) {
+                //浼氳瘽ID
+                info.setId("0");
+                //涓婅娴侀噺
+                long bytesReceived = item.getBytesReceived();
+                String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                info.setUpTraffic(formatReceivedSize);
+            } else {
+                RtspSession rtspSession = getRtspSessionById(source.getId());
+                //浼氳瘽ID
+                info.setId(rtspSession.getId());
+                //寮�濮嬫帹娴佹椂闂�
+                info.setBeginTime(rtspSession.getCreated());
+                //涓婅娴侀噺
+                long bytesReceived = rtspSession.getBytesReceived();
+                String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                info.setUpTraffic(formatReceivedSize);
+                //涓嬭娴侀噺
+                long bytesSent = rtspSession.getBytesSent();
+                String formatSentSize = ArdTool.formatFileSize(bytesSent);
+                info.setDownTraffic(formatSentSize);
+                //鎺ㄦ祦鏈嶅姟鍣�
+                info.setRemoteAddr(rtspSession.getRemoteAddr());
             }
-            RtspSession rtspSession = getRtspSessionById(source.getId());
-            //浼氳瘽ID
-            info.setId(rtspSession.getId());
-            //寮�濮嬫帹娴佹椂闂�
-            info.setBeginTime(rtspSession.getCreated());
-            //涓婅娴侀噺
-            long bytesReceived = rtspSession.getBytesReceived();
-            String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
-            info.setUpTraffic(formatReceivedSize);
-            //涓嬭娴侀噺
-            long bytesSent = rtspSession.getBytesSent();
-            String formatSentSize = ArdTool.formatFileSize(bytesSent);
-            info.setDownTraffic(formatSentSize);
             //RTSP婧愬湴鍧�
             String runondemand = item.getConf().getRunondemand();
             String runoninit;
@@ -255,25 +293,26 @@
             Matcher matcher = pattern.matcher(runoninit);
             if (matcher.find()) {
                 info.setRtspSource(matcher.group());
+            } else {
+                info.setRtspSource(item.getConf().getSource());
             }
             //浼犺緭鍗忚
-            regex = "-rtsp_transport\\s+(\\w+)";
-            pattern = Pattern.compile(regex);
-            matcher = pattern.matcher(runoninit);
-            if (matcher.find()) {
-                info.setProtocol(matcher.group(1));
-            }
+            info.setProtocol(item.getConf().getSourceprotocol());
             //鎷夋祦鏁伴噺
             List<Readers> readers = item.getReaders();
             info.setNum(readers.size());
-            //鎺ㄦ祦鏈嶅姟鍣�
-            info.setRemoteAddr(rtspSession.getRemoteAddr());
+
 
             PushStreamInfoList.add(info);
         }
         return PushStreamInfoList;
     }
 
+    /**
+     * 鑾峰彇鎷夋祦鍒楄〃
+     * 鍒樿嫃涔�
+     * 2023/8/29 9:37:05
+     */
     @Override
     public List<StreamInfo> getPullStreamList() {
         List<StreamInfo> PullStreamInfoList = new ArrayList<>();
@@ -281,49 +320,130 @@
         JsonsRoot jsonsRoot = JSONObject.parseObject(list, JsonsRoot.class);
         List<Items> items = jsonsRoot.getItems();
         for (Items item : items) {
-            StreamInfo info = new StreamInfo();
-            //ID
-            String name = item.getName();
-            info.setName(name);
-            //RTSP鎾斁鍦板潃
-            String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
-            info.setRtspUrl(rtspUrl);
             List<Readers> readers = item.getReaders();
             for (Readers reader : readers) {
-                RtspSession rtspSession = getRtspSessionById(reader.getId());
-                //浼氳瘽ID
-                info.setId(rtspSession.getId());
-                //寮�濮嬫媺娴佹椂闂�
-                info.setBeginTime(rtspSession.getCreated());
-                //涓婅娴侀噺
-                long bytesReceived = rtspSession.getBytesReceived();
-                String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
-                info.setUpTraffic(formatReceivedSize);
-                //涓嬭娴侀噺
-                long bytesSent = rtspSession.getBytesSent();
-                String formatSentSize = ArdTool.formatFileSize(bytesSent);
-                info.setDownTraffic(formatSentSize);
-
+                StreamInfo info = new StreamInfo();
+                //ID
+                String name = item.getName();
+                info.setName(name);
                 //浼犺緭鍗忚
-                String runoninit = item.getConf().getRunondemand();
-                String regex = "-rtsp_transport\\s+(\\w+)";
-                Pattern pattern = Pattern.compile(regex);
-                Matcher matcher = pattern.matcher(runoninit);
-                if (matcher.find()) {
-                    info.setProtocol(matcher.group(1));
+                info.setProtocol(item.getConf().getSourceprotocol());
+
+                String type = reader.getType();
+                switch (type) {
+                    case "rtmpConn":
+                        info.setSessionType("rtmp");
+                        //webrtc鎾斁鍦板潃
+                        String url = "rtmp://" + mediamtxHost + ":1935/" + name;
+                        info.setRtspUrl(url);
+                        RtmpSession rtmpSession = getRtmpSessionById(reader.getId());
+                        //浼氳瘽ID
+                        info.setId(rtmpSession.getId());
+                        //寮�濮嬫媺娴佹椂闂�
+                        info.setBeginTime(rtmpSession.getCreated());
+                        //涓婅娴侀噺
+                        long bytesReceived = rtmpSession.getBytesReceived();
+                        String formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                        info.setUpTraffic(formatReceivedSize);
+                        //涓嬭娴侀噺
+                        long bytesSent = rtmpSession.getBytesSent();
+                        String formatSentSize = ArdTool.formatFileSize(bytesSent);
+                        info.setDownTraffic(formatSentSize);
+                        //鎷夋祦鏈嶅姟鍣�
+                        info.setRemoteAddr(rtmpSession.getRemoteAddr());
+                        PullStreamInfoList.add(info);
+                        break;
+                    case "webRTCSession":
+                        info.setSessionType("webrtc");
+                        //webrtc鎾斁鍦板潃
+                        url = "http://" + mediamtxHost + ":8889/" + name;
+                        info.setRtspUrl(url);
+                        WebrtcSession webrtcSession = getWebrtcSessionById(reader.getId());
+                        //浼氳瘽ID
+                        info.setId(webrtcSession.getId());
+                        //寮�濮嬫媺娴佹椂闂�
+                        info.setBeginTime(webrtcSession.getCreated());
+                        //涓婅娴侀噺
+                        bytesReceived = webrtcSession.getBytesReceived();
+                        formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                        info.setUpTraffic(formatReceivedSize);
+                        //涓嬭娴侀噺
+                        bytesSent = webrtcSession.getBytesSent();
+                        formatSentSize = ArdTool.formatFileSize(bytesSent);
+                        info.setDownTraffic(formatSentSize);
+                        //鎷夋祦鏈嶅姟鍣�
+                        info.setRemoteAddr(webrtcSession.getRemoteAddr());
+                        PullStreamInfoList.add(info);
+                        break;
+                    case "rtspSession":
+                        info.setSessionType("rtsp");
+                        //RTSP鎾斁鍦板潃
+                        String rtspUrl = "rtsp://" + mediamtxHost + ":8554/" + name;
+                        info.setRtspUrl(rtspUrl);
+                        RtspSession rtspSession = getRtspSessionById(reader.getId());
+                        //浼氳瘽ID
+                        info.setId(rtspSession.getId());
+                        //寮�濮嬫媺娴佹椂闂�
+                        info.setBeginTime(rtspSession.getCreated());
+                        //涓婅娴侀噺
+                        bytesReceived = rtspSession.getBytesReceived();
+                        formatReceivedSize = ArdTool.formatFileSize(bytesReceived);
+                        info.setUpTraffic(formatReceivedSize);
+                        //涓嬭娴侀噺
+                        bytesSent = rtspSession.getBytesSent();
+                        formatSentSize = ArdTool.formatFileSize(bytesSent);
+                        info.setDownTraffic(formatSentSize);
+                        //鎷夋祦鏈嶅姟鍣�
+                        info.setRemoteAddr(rtspSession.getRemoteAddr());
+                        PullStreamInfoList.add(info);
+                        break;
                 }
-                //鎷夋祦鏈嶅姟鍣�
-                info.setRemoteAddr(rtspSession.getRemoteAddr());
-                PullStreamInfoList.add(info);
             }
         }
+        Comparator<StreamInfo> comparator = Comparator.comparing(streamInfo -> streamInfo.getBeginTime()); // 浣跨敤Collections.sort鏂规硶杩涜鎺掑簭 Collections.sort(personList, comparator);
+        Collections.sort(PullStreamInfoList, comparator.reversed());
         return PullStreamInfoList;
     }
 
+    /**
+     * 韪㈠嚭rtsp浼氳瘽
+     * 鍒樿嫃涔�
+     * 2023/8/29 9:37:05
+     */
     @Override
     public Boolean kickRtspSession(String sessionId) {
         try {
-            mediaClient.kick(sessionId);
+            mediaClient.kickRtspSessions(sessionId);
+            return true;
+        } catch (Exception ex) {
+            return false;
+        }
+    }
+
+    /**
+     * 韪㈠嚭rtmp浼氳瘽
+     * 鍒樿嫃涔�
+     * 2023/8/29 9:37:05
+     */
+    @Override
+    public Boolean kickRtmpSession(String sessionId) {
+        try {
+            mediaClient.kickRtmpSessions(sessionId);
+            return true;
+        } catch (Exception ex) {
+            return false;
+        }
+    }
+
+    /**
+     * 韪㈠嚭webrtc浼氳瘽
+     * 鍒樿嫃涔�
+     * 2023/8/29 9:37:05
+     */
+    @Override
+    public Boolean kickWebrtcSession(String sessionId) {
+        try {
+            mediaClient.kickWebrtcSessions(sessionId);
             return true;
         } catch (Exception ex) {
             return false;

--
Gitblit v1.9.3