兼容流注销时流产生类型错误的问题

648540858

2021-12-03 42d8fff57403500b880886e13093e1841bf47e54

 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -27,7 +27,9 @@
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -47,7 +49,7 @@
    private boolean sslEnabled;

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

    @Autowired
    private MediaConfig mediaConfig;
@@ -80,6 +82,9 @@
        logger.info("Media Server 缓存初始化");
        List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll();
        for (MediaServerItem mediaServerItem : mediaServerItemList) {
            if (StringUtils.isEmpty(mediaServerItem.getId())) {
                continue;
            }
            // 更新
            if (mediaServerItem.getSsrcConfig() == null) {
                SsrcConfig ssrcConfig = new SsrcConfig(mediaServerItem.getId(), null, sipConfig.getDomain());
@@ -199,6 +204,15 @@
            }
            result.add(mediaServerItem);
        }
        result.sort((serverItem1, serverItem2)->{
            int sortResult = 0;
            try {
                sortResult = format.parse(serverItem1.getCreateTime()).compareTo(format.parse(serverItem2.getCreateTime()));
            } catch (ParseException e) {
                e.printStackTrace();
            }
            return  sortResult;
        });
        return result;
    }

@@ -242,6 +256,11 @@
    }

    @Override
    public MediaServerItem getDefaultMediaServer() {
        return mediaServerMapper.queryDefault();
    }

    @Override
    public void clearMediaServerForOnline() {
        String key = VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX;
        redisUtil.del(key);
@@ -262,7 +281,9 @@
                    result.setMsg("保存失败，媒体服务ID [ " + zlmServerConfig.getGeneralMediaServerId() + " ] 已存在，请修改媒体服务器配置");
                    return result;
                }
                mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
                zlmServerConfig.setIp(mediaServerItem.getIp());
                mediaServerMapper.add(mediaServerItem);
                handLeZLMServerConfig(zlmServerConfig);
                result.setCode(0);
                result.setMsg("success");
@@ -278,82 +299,107 @@
       return result;
    }

    @Override
    public int addToDatabase(MediaServerItem mediaSerItem) {
        return mediaServerMapper.add(mediaSerItem);
    }

    /**
     * 处理zlm上线
     * @param zlmServerConfig zlm上线携带的参数
     */
    @Override
    public void handLeZLMServerConfig(ZLMServerConfig zlmServerConfig) {
        logger.info("[ {} ]-[ {}:{} ]已连接",
        logger.info("[ ZLM：{} ]-[ {}:{} ]已连接",
                zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());

        MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
        if (serverItem == null) {
            serverItem = mediaServerMapper.queryOneByHostAndPort(zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
        }
        if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
                || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
            // 配置文件的zlm
            // 如果是配置文件中的zlm。 也就是默认zlm。 一切以配置文件内容为准
            // docker部署不会使用zlm配置的端口号不是默认的则不做更新， 配置修改需要自行修改server配置;
            MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
            serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
            if (mediaConfig.getHttpPort() == 0) {
                serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
            }
            if (mediaConfig.getHttpSSlPort() == 0) {
                serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
            }
            if (mediaConfig.getRtmpPort() == 0) {
                serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
            }
            if (mediaConfig.getRtmpSSlPort() == 0) {
                serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
            }
            if (mediaConfig.getRtspPort() == 0) {
                serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
            }
            if (mediaConfig.getRtspSSLPort() == 0) {
                serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
            }
            if (mediaConfig.getRtpProxyPort() == 0) {
                serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
            }
            if (serverItem != null){
                mediaServerMapper.delDefault();
                mediaServerMapper.add(serverItemFromConfig);
                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
                MediaServerItem serverItemInRedis =  (MediaServerItem)redisUtil.get(key);
                if (serverItemInRedis != null) {
                    serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
                }else {
                    serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
                }
                redisUtil.set(key, serverItemFromConfig);
            }else {
                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
                serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
                redisUtil.set(key, serverItemFromConfig);
                mediaServerMapper.add(serverItemFromConfig);
            }
            resetOnlineServerItem(serverItemFromConfig);
            setZLMConfig(serverItemFromConfig);
        }else {
            String now = this.format.format(System.currentTimeMillis());
            if (serverItem == null){
                    // 一个新的zlm接入wvp
                    serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
                    serverItem.setCreateTime(now);
                    serverItem.setUpdateTime(now);
                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
                serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
                redisUtil.set(key, serverItem);
                // 存入数据库
                mediaServerMapper.add(serverItem);
                setZLMConfig(serverItem);
            }
            resetOnlineServerItem(serverItem);
        if (serverItem == null) {
            logger.warn("[未注册的zlm] 拒接接入：来自{}：{}", zlmServerConfig.getIp(),zlmServerConfig.getHttpPort() );
            return;
        }
        if (StringUtils.isEmpty(serverItem.getId())) {
            serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
        }
        if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId()) == null) {
            SsrcConfig ssrcConfig = new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain());
            serverItem.setSsrcConfig(ssrcConfig);
            redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId(), serverItem);
        }

        serverItem.setStatus(true);
        mediaServerMapper.update(serverItem);
        resetOnlineServerItem(serverItem);
        setZLMConfig(serverItem);

//        if (zlmServerConfig.getGeneralMediaServerId().equals(mediaConfig.getId())
//                || (zlmServerConfig.getIp().equals(mediaConfig.getIp()) && zlmServerConfig.getHttpPort() == mediaConfig.getHttpPort())) {
//            // 配置文件的zlm
//            // 如果是配置文件中的zlm。 也就是默认zlm。 一切以配置文件内容为准
//            // wvp互惠修改zlm的端口，需要自行配置。
//            MediaServerItem serverItemFromConfig = mediaConfig.getMediaSerItem();
//            serverItemFromConfig.setId(zlmServerConfig.getGeneralMediaServerId());
//            if (mediaConfig.getHttpPort() == 0) {
//                serverItemFromConfig.setHttpPort(zlmServerConfig.getHttpPort());
//            }
//            if (mediaConfig.getHttpSSlPort() == 0) {
//                serverItemFromConfig.setHttpSSlPort(zlmServerConfig.getHttpSSLport());
//            }
//            if (mediaConfig.getRtmpPort() == 0) {
//                serverItemFromConfig.setRtmpPort(zlmServerConfig.getRtmpPort());
//            }
//            if (mediaConfig.getRtmpSSlPort() == 0) {
//                serverItemFromConfig.setRtmpSSlPort(zlmServerConfig.getRtmpSslPort());
//            }
//            if (mediaConfig.getRtspPort() == 0) {
//                serverItemFromConfig.setRtspPort(zlmServerConfig.getRtspPort());
//            }
//            if (mediaConfig.getRtspSSLPort() == 0) {
//                serverItemFromConfig.setRtspSSLPort(zlmServerConfig.getRtspSSlport());
//            }
//            if (mediaConfig.getRtpProxyPort() == 0) {
//                serverItemFromConfig.setRtpProxyPort(zlmServerConfig.getRtpProxyPort());
//            }
//            if (serverItem != null){
//                mediaServerMapper.delDefault();
//                mediaServerMapper.add(serverItemFromConfig);
//                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
//                MediaServerItem serverItemInRedis =  (MediaServerItem)redisUtil.get(key);
//                if (serverItemInRedis != null) {
//                    serverItemFromConfig.setSsrcConfig(serverItemInRedis.getSsrcConfig());
//                }else {
//                    serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
//                }
//                redisUtil.set(key, serverItemFromConfig);
//            }else {
//                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItemFromConfig.getId();
//                serverItemFromConfig.setSsrcConfig(new SsrcConfig(serverItemFromConfig.getId(), null, sipConfig.getDomain()));
//                redisUtil.set(key, serverItemFromConfig);
//                mediaServerMapper.add(serverItemFromConfig);
//            }
//            resetOnlineServerItem(serverItemFromConfig);
//            setZLMConfig(serverItemFromConfig);
//        }
        // 移除未添加的zlm的接入，所有的zlm必须先添加后才可以加入使用
//        else {
//            String now = this.format.format(System.currentTimeMillis());
//            if (serverItem == null){
//                    // 一个新的zlm接入wvp
//                    serverItem = new MediaServerItem(zlmServerConfig, sipConfig.getIp());
//                    serverItem.setCreateTime(now);
//                    serverItem.setUpdateTime(now);
//                String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId();
//                serverItem.setSsrcConfig(new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain()));
//                redisUtil.set(key, serverItem);
//                // 存入数据库
//                mediaServerMapper.add(serverItem);
//                setZLMConfig(serverItem);
//            }
//            resetOnlineServerItem(serverItem);
//        }
    }

    @Override
@@ -423,7 +469,7 @@
     */
    @Override
    public void setZLMConfig(MediaServerItem mediaServerItem) {
        logger.info("[ {} ]-[ {}:{} ]设置zlm",
        logger.info("[ ZLM：{} ]-[ {}:{} ]设置zlm",
                mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
        String protocol = sslEnabled ? "https" : "http";
        String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
@@ -448,16 +494,17 @@
        param.put("hook.on_stream_changed",String.format("%s/on_stream_changed", hookPrex));
        param.put("hook.on_stream_none_reader",String.format("%s/on_stream_none_reader", hookPrex));
        param.put("hook.on_stream_not_found",String.format("%s/on_stream_not_found", hookPrex));
        param.put("hook.on_server_keepalive",String.format("%s/on_server_keepalive", hookPrex));
        param.put("hook.timeoutSec","20");
        param.put("general.streamNoneReaderDelayMS","-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())?"3600000":mediaServerItem.getStreamNoneReaderDelayMS() );

        JSONObject responseJSON = zlmresTfulUtils.setServerConfig(mediaServerItem, param);

        if (responseJSON != null && responseJSON.getInteger("code") == 0) {
            logger.info("[ {} ]-[ {}:{} ]设置zlm成功",
            logger.info("[ ZLM：{} ]-[ {}:{} ]设置zlm成功",
                    mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
        }else {
            logger.info("[ {} ]-[ {}:{} ]设置zlm失败",
            logger.info("[ ZLM：{} ]-[ {}:{} ]设置zlm失败",
                    mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
        }
    }