Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-07-13 668dc8f0dd8b667a95838eb5d0083a101aa2b6b0

Merge branch '2.6.8' into wvp-28181-2.0

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java

 sql/2.6.8²¹¶¡¸üÐÂ.sql

New file
@@ -0,0 +1,2 @@
alter table media_server
    add sendRtpPortRange varchar(50) not null;

 src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java

@@ -158,6 +158,7 @@
    public static final String WVP_STREAM_GB_ID_PREFIX = "memberNo_";

    public static final String WVP_STREAM_GPS_MSG_PREFIX = "WVP_STREAM_GPS_MSG_";

    public static final String WVP_OTHER_SEND_RTP_INFO = "VMP_OTHER_SEND_RTP_INFO_";

    public static final String WVP_OTHER_RECEIVE_RTP_INFO = "VMP_OTHER_RECEIVE_RTP_INFO_";



    /**

     * Redis Const


 src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java

@@ -234,4 +234,11 @@
        return false;
    }

    public String getRtpSendPortRange() {
        return rtpSendPortRange;
    }

    public void setRtpSendPortRange(String rtpSendPortRange) {
        this.rtpSendPortRange = rtpSendPortRange;
    }
}

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java

@@ -86,7 +86,10 @@
        }else {
            param.put("port", port);
        }
        if (ssrc != 0) {
        param.put("ssrc", ssrc);
        }

        JSONObject openRtpServerResultJson = zlmresTfulUtils.openRtpServer(mediaServerItem, param);
        logger.info(JSONObject.toJSONString(openRtpServerResultJson));
        if (openRtpServerResultJson != null) {

 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookType.java

@@ -21,5 +21,6 @@
    on_server_started,

    on_rtp_server_timeout,
    on_server_keepalive
    on_server_keepalive,
    on_send_rtp_stopped
}

 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/hook/HookResultForOnPublish.java

@@ -51,5 +51,13 @@
        this.mp4_save_path = mp4_save_path;
    }


    @Override
    public String toString() {
        return "HookResultForOnPublish{" +
                "enable_audio=" + enable_audio +
                ", enable_mp4=" + enable_mp4 +
                ", mp4_max_second=" + mp4_max_second +
                ", mp4_save_path='" + mp4_save_path + '\'' +
                '}';
    }
}

 src/main/java/com/genersoft/iot/vmp/vmanager/bean/OtherRtpSendInfo.java

@@ -5,12 +5,17 @@
    /**
     * å‘流IP
     */
    private String ip;
    private String sendLocalIp;

    /**
     * å‘流端口
     * éŸ³é¢‘发流端口
     */
    private int port;
    private int sendLocalPortForAudio;

    /**
     * è§†é¢‘发流端口
     */
    private int sendLocalPortForVideo;

    /**
     * æ”¶æµIP
@@ -18,9 +23,14 @@
    private String receiveIp;

    /**
     * æ”¶æµç«¯å£
     * éŸ³é¢‘收流端口
     */
    private int receivePort;
    private int receivePortForAudio;

    /**
     * è§†é¢‘收流端口
     */
    private int receivePortForVideo;

    /**
     * ä¼šè¯ID
@@ -48,23 +58,6 @@
    private String pushSSRC;



    public String getIp() {
        return ip;
    }

    public void setIp(String ip) {
        this.ip = ip;
    }

    public int getPort() {
        return port;
    }

    public void setPort(int port) {
        this.port = port;
    }

    public String getReceiveIp() {
        return receiveIp;
    }
@@ -73,12 +66,20 @@
        this.receiveIp = receiveIp;
    }

    public int getReceivePort() {
        return receivePort;
    public int getReceivePortForAudio() {
        return receivePortForAudio;
    }

    public void setReceivePort(int receivePort) {
        this.receivePort = receivePort;
    public void setReceivePortForAudio(int receivePortForAudio) {
        this.receivePortForAudio = receivePortForAudio;
    }

    public int getReceivePortForVideo() {
        return receivePortForVideo;
    }

    public void setReceivePortForVideo(int receivePortForVideo) {
        this.receivePortForVideo = receivePortForVideo;
    }

    public String getCallId() {
@@ -121,15 +122,45 @@
        this.pushSSRC = pushSSRC;
    }


    public String getSendLocalIp() {
        return sendLocalIp;
    }

    public void setSendLocalIp(String sendLocalIp) {
        this.sendLocalIp = sendLocalIp;
    }

    public int getSendLocalPortForAudio() {
        return sendLocalPortForAudio;
    }

    public void setSendLocalPortForAudio(int sendLocalPortForAudio) {
        this.sendLocalPortForAudio = sendLocalPortForAudio;
    }

    public int getSendLocalPortForVideo() {
        return sendLocalPortForVideo;
    }

    public void setSendLocalPortForVideo(int sendLocalPortForVideo) {
        this.sendLocalPortForVideo = sendLocalPortForVideo;
    }

    @Override
    public String toString() {
        return "OtherRtpSendInfo{" +
                "ip='" + ip + '\'' +
                ", port=" + port +
                "sendLocalIp='" + sendLocalIp + '\'' +
                ", sendLocalPortForAudio=" + sendLocalPortForAudio +
                ", sendLocalPortForVideo=" + sendLocalPortForVideo +
                ", receiveIp='" + receiveIp + '\'' +
                ", receivePort=" + receivePort +
                ", receivePortForAudio=" + receivePortForAudio +
                ", receivePortForVideo=" + receivePortForVideo +
                ", callId='" + callId + '\'' +
                ", stream='" + stream + '\'' +
                ", pushApp='" + pushApp + '\'' +
                ", pushStream='" + pushStream + '\'' +
                ", pushSSRC='" + pushSSRC + '\'' +
                '}';
    }
}

 src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java

@@ -3,21 +3,22 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.VersionInfo;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMServerFactory;
import com.genersoft.iot.vmp.media.zlm.SendRtpPortManager;
import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeFactory;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForRtpServerTimeout;
import com.genersoft.iot.vmp.media.zlm.dto.HookSubscribeForStreamChange;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnRtpServerTimeoutHookParam;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.OtherRtpSendInfo;
import io.swagger.v3.oas.annotations.Operation;
@@ -28,14 +29,16 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeUnit;

@SuppressWarnings("rawtypes")
@@ -60,19 +63,10 @@
    private IMediaServerService mediaServerService;

    @Autowired
    private VersionInfo versionInfo;

    @Autowired
    private SipConfig sipConfig;
    private SendRtpPortManager sendRtpPortManager;

    @Autowired
    private UserSetting userSetting;

    @Autowired
    private IDeviceService deviceService;

    @Autowired
    private IDeviceChannelService channelService;

    @Autowired
    private DynamicTask dynamicTask;
@@ -80,14 +74,6 @@

    @Autowired
    private RedisTemplate<Object, Object> redisTemplate;


    @Value("${server.port}")
    private int serverPort;


    @Autowired
    private IRedisCatchStorage redisCatchStorage;


    @GetMapping(value = "/receive/open")
@@ -121,12 +107,16 @@
            }catch (NumberFormatException e) {
                throw new ControllerException(ErrorCode.ERROR100.getCode(),"ssrc格式错误");
            }

        }
        int localPort = zlmServerFactory.createRTPServer(mediaServerItem, stream, ssrcInt, null, false, tcpMode);
        String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_" + callId + "_"  + stream;
        int localPortForVideo = zlmServerFactory.createRTPServer(mediaServerItem, stream, ssrcInt, null, false, tcpMode);
        int localPortForAudio = zlmServerFactory.createRTPServer(mediaServerItem, stream + "_a" , ssrcInt, null, false, tcpMode);
        if (localPortForVideo == 0 || localPortForAudio == 0) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "获取端口失败");
        }
        // æ³¨å†Œå›žè°ƒå¦‚æžœrtp收流超时则通过回调发送通知
        if (callBack != null) {
            HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(ssrc, null, mediaServerItem.getId());
            HookSubscribeForRtpServerTimeout hookSubscribeForRtpServerTimeout = HookSubscribeFactory.on_rtp_server_timeout(stream, String.valueOf(ssrcInt), mediaServerItem.getId());
            // è®¢é˜… zlm启动事件, æ–°çš„zlm也会从这里进入系统
            hookSubscribe.addSubscribe(hookSubscribeForRtpServerTimeout,
                    (mediaServerItemInUse, hookParam)->{
@@ -140,22 +130,33 @@
                            try {
                                client.newCall(request).execute();
                            } catch (IOException e) {
                                logger.error("[开启收流和获取发流信息] ç­‰å¾…收流超时 callId->{}, å‘送回调失败", callId, e);
                                logger.error("[第三方服务对接->开启收流和获取发流信息] ç­‰å¾…收流超时 callId->{}, å‘送回调失败", callId, e);
                            }
                            hookSubscribe.removeSubscribe(hookSubscribeForRtpServerTimeout);
                        }
                    });
        }
        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + callId;
        OtherRtpSendInfo otherRtpSendInfo = new OtherRtpSendInfo();
        otherRtpSendInfo.setReceiveIp(mediaServerItem.getSdpIp());
        otherRtpSendInfo.setReceivePort(localPort);
        otherRtpSendInfo.setReceivePortForVideo(localPortForVideo);
        otherRtpSendInfo.setReceivePortForAudio(localPortForAudio);
        otherRtpSendInfo.setCallId(callId);
        otherRtpSendInfo.setStream(stream);

        // å°†ä¿¡æ¯å†™å…¥redis中，以备后用
        redisTemplate.opsForValue().set(receiveKey, otherRtpSendInfo);
        if (isSend != null && isSend) {
            int port = sendRtpPortManager.getNextPort(mediaServerItem.getId());
            otherRtpSendInfo.setIp(mediaServerItem.getSdpIp());
            otherRtpSendInfo.setPort(port);
            logger.info("[开启收流和获取发流信息] ç»“果，callId->{}， {}", callId, otherRtpSendInfo);
            String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_"  + callId;
            // é¢„创建发流信息
            int portForVideo = sendRtpPortManager.getNextPort(mediaServerItem.getId());
            int portForAudio = sendRtpPortManager.getNextPort(mediaServerItem.getId());
            // å°†ä¿¡æ¯å†™å…¥redis中，以备后用
            redisTemplate.opsForValue().set(key, otherRtpSendInfo, 300, TimeUnit.SECONDS);
            otherRtpSendInfo.setSendLocalIp(mediaServerItem.getSdpIp());
            otherRtpSendInfo.setSendLocalPortForVideo(portForVideo);
            otherRtpSendInfo.setSendLocalPortForAudio(portForAudio);
            logger.info("[第三方服务对接->开启收流和获取发流信息] ç»“果，callId->{}， {}", callId, otherRtpSendInfo);
        }
        // å°†ä¿¡æ¯å†™å…¥redis中，以备后用
        redisTemplate.opsForValue().set(key, otherRtpSendInfo, 300, TimeUnit.SECONDS);
@@ -170,28 +171,69 @@
        logger.info("[第三方服务对接->关闭收流] stream->{}", stream);
        MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
        zlmServerFactory.closeRtpServer(mediaServerItem,stream);
        zlmServerFactory.closeRtpServer(mediaServerItem,stream + "_a");
        String receiveKey = VideoManagerConstants.WVP_OTHER_RECEIVE_RTP_INFO + userSetting.getServerId() + "_*_"  + stream;
        List<Object> scan = RedisUtil.scan(redisTemplate, receiveKey);
        if (scan.size() > 0) {
            for (Object key : scan) {
                // å°†ä¿¡æ¯å†™å…¥redis中，以备后用
                redisTemplate.delete(key);
            }
        }
    }

    @GetMapping(value = "/send/start")
    @ResponseBody
    @Operation(summary = "发送流")
    @Parameter(name = "ssrc", description = "发送流的SSRC", required = true)
    @Parameter(name = "ip", description = "目标IP", required = true)
    @Parameter(name = "port", description = "目标端口", required = true)
    @Parameter(name = "dstIpForAudio", description = "目标音频收流IP", required = false)
    @Parameter(name = "dstIpForVideo", description = "目标视频收流IP", required = false)
    @Parameter(name = "dstPortForAudio", description = "目标音频收流端口", required = false)
    @Parameter(name = "dstPortForVideo", description = "目标视频收流端口", required = false)
    @Parameter(name = "app", description = "待发送应用名", required = true)
    @Parameter(name = "stream", description = "待发送流Id", required = true)
    @Parameter(name = "callId", description = "整个过程的唯一标识，不传则使用随机端口发流", required = true)
    @Parameter(name = "onlyAudio", description = "是否只有音频", required = true)
    @Parameter(name = "isUdp", description = "是否为UDP", required = true)
    @Parameter(name = "streamType", description = "流类型，1为es流，2为ps流， é»˜è®¤es流", required = false)
    public void sendRTP(String ssrc, String ip, Integer port, String app, String stream, String callId, Boolean onlyAudio, Boolean isUdp, @RequestParam(required = false)Integer streamType) {
        logger.info("[第三方服务对接->发送流] ssrc->{}, ip->{}, port->{}, app->{}, stream->{}, callId->{}, onlyAudio->{}, streamType->{}",
                ssrc, ip, port, app, stream, callId, onlyAudio, streamType == 1? "ES":"PS");
        if (ObjectUtils.isEmpty(streamType)) {
            streamType = 1;
    @Parameter(name = "ptForAudio", description = "rtp的音频pt", required = false)
    @Parameter(name = "ptForVideo", description = "rtp的视频pt", required = false)
    public void sendRTP(String ssrc,
                        @RequestParam(required = false)String dstIpForAudio,
                        @RequestParam(required = false)String dstIpForVideo,
                        @RequestParam(required = false)Integer dstPortForAudio,
                        @RequestParam(required = false)Integer dstPortForVideo,
                        String app,
                        String stream,
                        String callId,
                        Boolean isUdp,
                        @RequestParam(required = false)Integer ptForAudio,
                        @RequestParam(required = false)Integer ptForVideo
        ) {
        logger.info("[第三方服务对接->发送流] " +
                        "ssrc->{}, \r\n" +
                        "dstIpForAudio->{}, \n" +
                        "dstIpForAudio->{}, \n" +
                        "dstPortForAudio->{},  \n" +
                        "dstPortForVideo->{}, \n" +
                        "app->{}, \n" +
                        "stream->{}, \n" +
                        "callId->{}, \n" +
                        "ptForAudio->{}, \n" +
                        "ptForVideo->{}",
                        ssrc,
                        dstIpForAudio,
                        dstIpForVideo,
                        dstPortForAudio,
                        dstPortForVideo,
                        app,
                        stream,
                        callId,
                        ptForAudio,
                        ptForVideo);
        if (!((dstPortForAudio > 0 && !ObjectUtils.isEmpty(dstPortForAudio) || (dstPortForVideo > 0 && !ObjectUtils.isEmpty(dstIpForVideo))))) {
            throw new ControllerException(ErrorCode.ERROR400.getCode(), "至少应该存在一组音频或视频发送参数");
        }
        MediaServerItem mediaServerItem = mediaServerService.getDefaultMediaServer();
        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + callId;
        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_"  + callId;
        OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
        if (sendInfo == null) {
            sendInfo = new OtherRtpSendInfo();
@@ -200,32 +242,123 @@
        sendInfo.setPushStream(stream);
        sendInfo.setPushSSRC(ssrc);

        Map<String, Object> param = new HashMap<>(12);
        param.put("vhost","__defaultVhost__");
        param.put("app",app);
        param.put("stream",stream);
        param.put("ssrc", ssrc);
        Map<String, Object> paramForAudio;
        Map<String, Object> paramForVideo;
        if (!ObjectUtils.isEmpty(dstIpForAudio) && dstPortForAudio > 0) {
            paramForAudio = new HashMap<>();
            paramForAudio.put("vhost","__defaultVhost__");
            paramForAudio.put("app",app);
            paramForAudio.put("stream",stream);
            paramForAudio.put("ssrc", ssrc);

        param.put("dst_url",ip);
        param.put("dst_port", port);
            paramForAudio.put("dst_url", dstIpForAudio);
            paramForAudio.put("dst_port", dstPortForAudio);
        String is_Udp = isUdp ? "1" : "0";
        param.put("is_udp", is_Udp);
        param.put("src_port", sendInfo.getPort());
        param.put("use_ps", streamType==2 ? "1" : "0");
        param.put("only_audio", onlyAudio ? "1" : "0");
            paramForAudio.put("is_udp", is_Udp);
            paramForAudio.put("src_port", sendInfo.getSendLocalPortForAudio());
            paramForAudio.put("use_ps", "0");
            paramForAudio.put("only_audio", "1");
            if (ptForAudio != null) {
                paramForAudio.put("pt", ptForAudio);
            }

        JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, param);
        } else {
            paramForAudio = null;
        }
        if (!ObjectUtils.isEmpty(dstIpForVideo) && dstPortForVideo > 0) {
            paramForVideo = new HashMap<>();
            paramForVideo.put("vhost","__defaultVhost__");
            paramForVideo.put("app",app);
            paramForVideo.put("stream",stream);
            paramForVideo.put("ssrc", ssrc);

            paramForVideo.put("dst_url", dstIpForVideo);
            paramForVideo.put("dst_port", dstPortForVideo);
            String is_Udp = isUdp ? "1" : "0";
            paramForVideo.put("is_udp", is_Udp);
            paramForVideo.put("src_port", sendInfo.getSendLocalPortForVideo());
            paramForVideo.put("use_ps", "0");
            paramForVideo.put("only_audio", "0");
            if (ptForVideo != null) {
                paramForVideo.put("pt", ptForVideo);
            }

        } else {
            paramForVideo = null;
        }

        Boolean streamReady = zlmServerFactory.isStreamReady(mediaServerItem, app, stream);
        if (streamReady) {
            if (paramForVideo != null) {
                JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForVideo);
        if (jsonObject.getInteger("code") == 0) {
            logger.info("[第三方服务对接->发送流] å‘流成功，callId->{}", callId);
                    logger.info("[第三方服务对接->发送流] è§†é¢‘流发流成功，callId->{}，param->{}", callId, paramForVideo);
            redisTemplate.opsForValue().set(key, sendInfo);
        }else {
            redisTemplate.delete(key);
            logger.info("[第三方服务对接->发送流] å‘流失败，callId->{}, {}", callId, jsonObject.getString("msg"));
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "[发流失败] " + jsonObject.getString("msg"));
                    logger.info("[第三方服务对接->发送流] è§†é¢‘流发流失败，callId->{}, {}", callId, jsonObject.getString("msg"));
                    throw new ControllerException(ErrorCode.ERROR100.getCode(), "[视频流发流失败] " + jsonObject.getString("msg"));
        }
    }
            if(paramForAudio != null) {
                JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForAudio);
                if (jsonObject.getInteger("code") == 0) {
                    logger.info("[第三方服务对接->发送流] éŸ³é¢‘流发流成功，callId->{}，param->{}", callId, paramForAudio);
                    redisTemplate.opsForValue().set(key, sendInfo);
                }else {
                    redisTemplate.delete(key);
                    logger.info("[第三方服务对接->发送流] éŸ³é¢‘流发流失败，callId->{}, {}", callId, jsonObject.getString("msg"));
                    throw new ControllerException(ErrorCode.ERROR100.getCode(), "[音频流发流失败] " + jsonObject.getString("msg"));
                }
            }
        }else {
            logger.info("[第三方服务对接->发送流] æµä¸å­˜åœ¨ï¼Œç­‰å¾…流上线，callId->{}", callId);
            String uuid = UUID.randomUUID().toString();
            HookSubscribeForStreamChange hookSubscribeForStreamChange = HookSubscribeFactory.on_stream_changed(app, stream, true, "rtsp", mediaServerItem.getId());
            dynamicTask.startDelay(uuid, ()->{
                logger.info("[第三方服务对接->发送流] ç­‰å¾…流上线超时 callId->{}", callId);
                redisTemplate.delete(key);
                hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
            }, 10000);


            // è®¢é˜… zlm启动事件, æ–°çš„zlm也会从这里进入系统
            OtherRtpSendInfo finalSendInfo = sendInfo;
            hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
            hookSubscribe.addSubscribe(hookSubscribeForStreamChange,
                    (mediaServerItemInUse, response)->{
                        dynamicTask.stop(uuid);
                        logger.info("[第三方服务对接->发送流] æµä¸Šçº¿ï¼Œå¼€å§‹å‘流 callId->{}", callId);
                        try {
                            Thread.sleep(400);
                        } catch (InterruptedException e) {
                            throw new RuntimeException(e);
                        }
                        if (paramForVideo != null) {
                            JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForVideo);
                            if (jsonObject.getInteger("code") == 0) {
                                logger.info("[第三方服务对接->发送流] è§†é¢‘流发流成功，callId->{}，param->{}", callId, paramForVideo);
                                redisTemplate.opsForValue().set(key, finalSendInfo);
                            }else {
                                redisTemplate.delete(key);
                                logger.info("[第三方服务对接->发送流] è§†é¢‘流发流失败，callId->{}, {}", callId, jsonObject.getString("msg"));
                                throw new ControllerException(ErrorCode.ERROR100.getCode(), "[视频流发流失败] " + jsonObject.getString("msg"));
                            }
                        }
                        if(paramForAudio != null) {
                            JSONObject jsonObject = zlmServerFactory.startSendRtpStream(mediaServerItem, paramForAudio);
                            if (jsonObject.getInteger("code") == 0) {
                                logger.info("[第三方服务对接->发送流] éŸ³é¢‘流发流成功，callId->{}，param->{}", callId, paramForAudio);
                                redisTemplate.opsForValue().set(key, finalSendInfo);
                            }else {
                                redisTemplate.delete(key);
                                logger.info("[第三方服务对接->发送流] éŸ³é¢‘流发流失败，callId->{}, {}", callId, jsonObject.getString("msg"));
                                throw new ControllerException(ErrorCode.ERROR100.getCode(), "[音频流发流失败] " + jsonObject.getString("msg"));
                            }
                        }
                        hookSubscribe.removeSubscribe(hookSubscribeForStreamChange);
                    });
        }
    }

    @GetMapping(value = "/send/stop")
    @ResponseBody
@@ -233,7 +366,7 @@
    @Parameter(name = "callId", description = "整个过程的唯一标识，不传则使用随机端口发流", required = true)
    public void closeSendRTP(String callId) {
        logger.info("[第三方服务对接->关闭发送流] callId->{}", callId);
        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + callId;
        String key = VideoManagerConstants.WVP_OTHER_SEND_RTP_INFO + userSetting.getServerId() + "_"  + callId;
        OtherRtpSendInfo sendInfo = (OtherRtpSendInfo)redisTemplate.opsForValue().get(key);
        if (sendInfo == null){
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "未开启发流");
@@ -251,6 +384,7 @@
        }else {
            logger.info("[第三方服务对接->关闭发送流] æˆåŠŸ callId->{}", callId);
        }
        redisTemplate.delete(key);
    }

}