优化回调设置方式

648540858

2024-04-16 f357bece629710f8d9916b070c0f4ce185f7ac75

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

@@ -18,10 +18,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;

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.zlm.dto.HookType;

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

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

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

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

import com.genersoft.iot.vmp.media.zlm.dto.hook.*;

import com.genersoft.iot.vmp.service.*;

import com.genersoft.iot.vmp.service.bean.MessageForPushChannel;

@@ -103,9 +100,6 @@
    private EventPublisher eventPublisher;



    @Autowired

    private ZLMMediaListManager zlmMediaListManager;



    @Autowired

    private ZlmHttpHookSubscribe subscribe;



    @Autowired

@@ -129,6 +123,9 @@


    @Autowired

    private RedisTemplate<Object, Object> redisTemplate;



    @Autowired

    private IStreamPushService streamPushService;



    /**

     * 服务器定时上报时间，上报间隔可配置，默认10s上报一次

@@ -236,10 +233,7 @@
                // 鉴权通过

                redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);

            }

        } else {

            zlmMediaListManager.sendStreamEvent(param.getApp(), param.getStream(), param.getMediaServerId());

        }





        HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();

        result.setEnable_audio(true);

@@ -260,7 +254,6 @@
        if ("rtp".equals(param.getApp())) {



            InviteInfo inviteInfo = inviteStreamService.getInviteInfoByStream(null, param.getStream());



            // 单端口模式下修改流 ID

            if (!mediaInfo.isRtpEnable() && inviteInfo == null) {

                String ssrc = String.format("%010d", Long.parseLong(param.getStream(), 16));

@@ -268,6 +261,8 @@
                if (inviteInfo != null) {

                    result.setStream_replace(inviteInfo.getStream());

                    logger.info("[ZLM HOOK]推流鉴权 stream: {} 替换为 {}", param.getStream(), inviteInfo.getStream());

                    // 单端口模式下修改流ID为目标流ID，不然其他地方可能都无法对应

                    param.setStream(inviteInfo.getStream());

                }

            }



@@ -464,8 +459,7 @@
                                    || param.getOriginType() == OriginType.RTMP_PUSH.ordinal()

                                    || param.getOriginType() == OriginType.RTC_PUSH.ordinal()) {

                                param.setSeverId(userSetting.getServerId());

                                zlmMediaListManager.addPush(param);



                                streamPushService.updatePush(param);

                                // 冗余数据，自己系统中自用

                                redisCatchStorage.addPushListItem(param.getApp(), param.getStream(), param);

                            }

@@ -482,10 +476,13 @@
                                }

                            }

                            GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());

                            if (gbStream != null) {

//                           eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                            // 查找是否关联了国标， 关联了不删除， 置为离线

                            if (gbStream == null) {

                                storager.removeMedia(param.getApp(), param.getStream());

                            }else {

//                                eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                                storager.mediaOffline(param.getApp(), param.getStream());

                            }

                            zlmMediaListManager.removeMedia(param.getApp(), param.getStream());

                        }

                        GbStream gbStream = storager.getGbStream(param.getApp(), param.getStream());

                        if (gbStream != null) {