Merge remote-tracking branch 'origin/dev' into dev

Xiajijian

2025-10-13 77ae6ed9a1a800bab0d048a6453d383ec35a54b9

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java

@@ -20,7 +20,7 @@
import com.ard.sample.manage.service.ILiveStreamService;
import com.ard.vtdu.config.MediamtxConfig;
import com.ard.vtdu.domain.ArdVtdu;
import com.ard.vtdu.service.IMediaMTXService;
import com.ard.vtdu.service.IArdMediaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -52,7 +52,7 @@
    private IMessageSenderService messageSender;

    @Resource
    private IMediaMTXService mediaService;
    private IArdMediaService ardMediaService;
    @Resource
    private MediamtxConfig mediamtxConfig;

@@ -118,7 +118,8 @@
            case RTMP:
                ArdVtdu vtdu = new ArdVtdu();
                vtdu.setName(liveParam.getVideoId());
                vtdu = mediaService.addPath(vtdu);
                vtdu.setRtspSource("publisher");
                vtdu = ardMediaService.addPath(vtdu);
                live.setRtmpUrl(vtdu.getRtmpUrl());
                live.setRtspUrl(vtdu.getRtspUrl());
                live.setWebrtcUrl(vtdu.getWebrtcUrl());
@@ -147,7 +148,7 @@
        if (receiveReply.getResult() != 0) {
            return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
        }
        mediaService.removePath(videoId);
        ardMediaService.removePath(videoId);
        return ResponseResult.success();
    }