修复点播与录像回放

648540858

2024-03-31 5973dcd9752079aaf32b4b5f00bd90d689844ec8

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

@@ -11,9 +11,10 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;

import com.genersoft.iot.vmp.media.bean.ResultForOnPublish;

import com.genersoft.iot.vmp.media.event.*;

import com.genersoft.iot.vmp.media.event.hook.HookSubscribe;

import com.genersoft.iot.vmp.media.event.hook.HookType;

import com.genersoft.iot.vmp.media.event.media.*;

import com.genersoft.iot.vmp.media.event.mediaServer.MediaSendRtpStoppedEvent;

import com.genersoft.iot.vmp.media.service.IMediaServerService;

import com.genersoft.iot.vmp.media.zlm.dto.MediaServer;

import com.genersoft.iot.vmp.media.zlm.dto.ZLMServerConfig;

@@ -172,15 +173,8 @@
        String mediaServerId = json.getString("mediaServerId");

        MediaServer mediaServer = mediaServerService.getOne(mediaServerId);

        if (mediaServer == null) {

            return new HookResultForOnPublish(200, "success");

            return new HookResultForOnPublish(0, "success");

        }



        taskExecutor.execute(() -> {

            HookSubscribe.Event subscribe = this.subscribe.sendNotify(HookType.on_publish, json);

            if (subscribe != null) {

                subscribe.response(mediaServer, param);

            }

        });



        ResultForOnPublish resultForOnPublish = mediaService.authenticatePublish(mediaServer, param.getApp(), param.getStream(), param.getParams());

        if (resultForOnPublish != null) {

@@ -203,6 +197,9 @@
    public HookResult onStreamChanged(@RequestBody OnStreamChangedHookParam param) {



        MediaServer mediaServer = mediaServerService.getOne(param.getMediaServerId());

        if (mediaServer == null) {

            return HookResult.SUCCESS();

        }



        if (param.isRegist()) {

            logger.info("[ZLM HOOK] 流注册, {}->{}->{}/{}", param.getMediaServerId(), param.getSchema(), param.getApp(), param.getStream());

@@ -316,19 +313,12 @@
            MediaServer mediaServerItem = mediaServerService.getOne(param.getMediaServerId());

            if (mediaServerItem != null) {

                event.setMediaServer(mediaServerItem);

                event.setApp("rtp");

                applicationEventPublisher.publishEvent(event);

            }

        }catch (Exception e) {

            logger.info("[ZLM-HOOK-rtpServer收流超时] 发送通知失败 ", e);

        }

        taskExecutor.execute(() -> {

            List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_rtp_server_timeout);

            if (subscribes != null && !subscribes.isEmpty()) {

                for (HookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, param);

                }

            }

        });



        return HookResult.SUCCESS();

    }

@@ -341,16 +331,16 @@
    public HookResult onRecordMp4(HttpServletRequest request, @RequestBody OnRecordMp4HookParam param) {

        logger.info("[ZLM HOOK] 录像完成事件：{}->{}", param.getMediaServerId(), param.getFile_path());



        taskExecutor.execute(() -> {

            List<HookSubscribe.Event> subscribes = this.subscribe.getSubscribes(HookType.on_record_mp4);

            if (subscribes != null && !subscribes.isEmpty()) {

                for (HookSubscribe.Event subscribe : subscribes) {

                    subscribe.response(null, param);

                }

        try {

            MediaServer mediaServerItem = mediaServerService.getOne(param.getMediaServerId());

            if (mediaServerItem != null) {

                MediaRecordMp4Event event = MediaRecordMp4Event.getInstance(this, param, mediaServerItem);

                event.setMediaServer(mediaServerItem);

                applicationEventPublisher.publishEvent(event);

            }

            cloudRecordService.addRecord(param);



        });

        }catch (Exception e) {

            logger.info("[ZLM-HOOK-rtpServer收流超时] 发送通知失败 ", e);

        }



        return HookResult.SUCCESS();

    }