在redis中添加wvp存活依据，添加推流变化消息

648540858

2021-11-23 b1c92cf4e88447fc59a2b0b8b78c0e2c41282141

在redis中添加wvp存活依据，添加推流变化消息

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

@@ -8,7 +8,9 @@
 */

public class VideoManagerConstants {

    

    public static final String WVP_SERVER_PREFIX = "VMP_wvp_server";

    public static final String WVP_SERVER_PREFIX = "VMP_SIGNALLING_SERVER_INFO_";



    public static final String WVP_SERVER_STREAM_PUSH_PREFIX = "VMP_SIGNALLING_STREAM_PUSH_";



    public static final String MEDIA_SERVER_PREFIX = "VMP_MEDIA_SERVER_";



@@ -51,4 +53,7 @@
    public static final String MEDIA_SSRC_USED_PREFIX = "VMP_media_used_ssrc_";



    public static final String MEDIA_TRANSACTION_USED_PREFIX = "VMP_media_transaction_";



    //************************** redis 消息*********************************

    public static final String WVP_MSG_STREAM_PUSH_CHANGE_PREFIX = "WVP_msg_stream_push_change";

}


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

@@ -27,6 +27,8 @@

    private Boolean logInDatebase = Boolean.TRUE;

    private String serverId = "000000";

    private List<String> interfaceAuthenticationExcludes = new ArrayList<>();

    public Boolean getSavePositionHistory() {
@@ -104,4 +106,12 @@
    public void setLogInDatebase(Boolean logInDatebase) {
        this.logInDatebase = logInDatebase;
    }

    public String getServerId() {
        return serverId;
    }

    public void setServerId(String serverId) {
        this.serverId = serverId;
    }
}

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

File was deleted

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

@@ -1,7 +1,10 @@
package com.genersoft.iot.vmp.conf;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

@@ -12,13 +15,22 @@
    private IRedisCatchStorage redisCatchStorage;

    @Autowired
    private SipConfig sipConfig;
    private IMediaServerService mediaServerService;

    @Autowired
    private MediaConfig mediaConfig;
    private UserSetup userSetup;

//    @Scheduled(cron="0/2 * *  * * ? ")   //每3秒执行一次
//    public void execute(){
////        redisCatchStorage.updateWVPInfo();
//    }
    @Value("${server.port}")
    private int serverPort;

    @Autowired
    private SipConfig sipConfig;

    @Scheduled(fixedRate = 2 * 1000)   //每3秒执行一次
    public void execute(){
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("ip", sipConfig.getIp());
        jsonObject.put("port", serverPort);
        redisCatchStorage.updateWVPInfo(userSetup.getServerId(), jsonObject, 3);
    }
}

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -37,8 +37,6 @@


    public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";



    public static final String CALLBACK_ONVIF = "CALLBACK_ONVIF";



    public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION";



    public static final String CALLBACK_CMD_PRESETQUERY = "CALLBACK_PRESETQUERY";


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

@@ -10,6 +10,7 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;

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

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

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

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

import com.genersoft.iot.vmp.storager.IRedisCatchStorage;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

@@ -55,6 +56,9 @@


    @Autowired

    private IMediaServerService mediaServerService;



    @Autowired

    private IMediaService mediaService;



    @Autowired

    private ZLMRESTfulUtils zlmresTfulUtils;

@@ -295,11 +299,23 @@
                }

            }else {

                if (!"rtp".equals(app) ){

                    // 发送流变化redis消息

                    JSONObject jsonObject = new JSONObject();

                    jsonObject.put("serverId", userSetup.getServerId());

                    jsonObject.put("app", app);

                    jsonObject.put("stream", streamId);

                    jsonObject.put("register", regist);

                    jsonObject.put("mediaServerId", mediaServerId);

                    redisCatchStorage.sendStreamChangeMsg(jsonObject);



                    MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);

                    if (regist) {

                        zlmMediaListManager.addMedia(mediaServerItem, app, streamId);

                        StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);

                        redisCatchStorage.addStream(mediaServerItem, app, streamId, streamInfo);

                    }else {

                        zlmMediaListManager.removeMedia( app, streamId);

                        redisCatchStorage.removeStream(mediaServerItem, app, streamId);

                    }

                }

            }


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

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

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

    @Autowired
    private MediaConfig mediaConfig;

 src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java

@@ -5,6 +5,7 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;

import java.util.List;
import java.util.Map;
@@ -120,5 +121,27 @@
    /**
     * 在redis添加wvp的信息
     */
    void updateWVPInfo(JSONObject jsonObject);
    void updateWVPInfo(String id, JSONObject jsonObject, int time);

    /**
     * 发送推流生成与推流消失消息
     * @param jsonObject 消息内容
     */
    void sendStreamChangeMsg(JSONObject jsonObject);

    /**
     * 添加流信息到redis
     * @param mediaServerItem
     * @param app
     * @param streamId
     */
    void addStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo);

    /**
     * 移除流信息从redis
     * @param mediaServerItem
     * @param app
     * @param streamId
     */
    void removeStream(MediaServerItem mediaServerItem, String app, String streamId);
}

 src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java

@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
@@ -295,8 +296,26 @@
    }

    @Override
    public void updateWVPInfo(JSONObject jsonObject) {

    public void updateWVPInfo(String id, JSONObject jsonObject, int time) {
        String key = VideoManagerConstants.WVP_SERVER_PREFIX + id;
        redis.set(key, jsonObject, time);
    }

    @Override
    public void sendStreamChangeMsg(JSONObject jsonObject) {
        String key = VideoManagerConstants.WVP_MSG_STREAM_PUSH_CHANGE_PREFIX;
        redis.convertAndSend(key, jsonObject.toJSONString());
    }

    @Override
    public void addStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo) {
        String key = VideoManagerConstants.WVP_SERVER_STREAM_PUSH_PREFIX + app + "_" + streamId + "_" + mediaServerItem.getId();
        redis.set(key, streamInfo);
    }

    @Override
    public void removeStream(MediaServerItem mediaServerItem, String app, String streamId) {
        String key = VideoManagerConstants.WVP_SERVER_STREAM_PUSH_PREFIX + app + "_" + streamId + "_" + mediaServerItem.getId();
        redis.del(key);
    }
}

 src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java

@@ -729,4 +729,10 @@
        return new ArrayList<>(keys);

    }



    //    ============================== 消息发送与订阅 ==============================

    public void convertAndSend(String channel, String msg) {

        redisTemplate.convertAndSend(channel, msg);



    }



}


 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiCompatibleController.java

File was renamed from src/main/java/com/genersoft/iot/vmp/web/ApiCompatibleController.java
@@ -1,4 +1,4 @@
package com.genersoft.iot.vmp.web;
package com.genersoft.iot.vmp.web.gb28181;

import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.service.IMediaService;

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java

File was renamed from src/main/java/com/genersoft/iot/vmp/web/ApiControlController.java
@@ -1,4 +1,4 @@
package com.genersoft.iot.vmp.web;
package com.genersoft.iot.vmp.web.gb28181;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java

File was renamed from src/main/java/com/genersoft/iot/vmp/web/ApiController.java
@@ -1,4 +1,4 @@
package com.genersoft.iot.vmp.web;
package com.genersoft.iot.vmp.web.gb28181;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.SipConfig;

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java

File was renamed from src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
@@ -1,4 +1,4 @@
package com.genersoft.iot.vmp.web;
package com.genersoft.iot.vmp.web.gb28181;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java

File was renamed from src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
@@ -1,4 +1,4 @@
package com.genersoft.iot.vmp.web;
package com.genersoft.iot.vmp.web.gb28181;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;

 src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java

File was renamed from src/main/java/com/genersoft/iot/vmp/web/AuthController.java
@@ -1,4 +1,4 @@
package com.genersoft.iot.vmp.web;
package com.genersoft.iot.vmp.web.gb28181;

import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.dto.User;