648540858
2021-12-15 3962352ec32137e9561c2ba16e192f1f7fdebade
优化zlm状态变化事件代码
1个文件已修改
1 文件已重命名
1个文件已删除
71 ■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMOfflineEventListener.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -444,7 +444,6 @@
            }
            return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
        }
    }
    
    /**
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMOfflineEventListener.java
File was deleted
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
File was renamed from src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMOnlineEventListener.java
@@ -1,16 +1,14 @@
package com.genersoft.iot.vmp.media.zlm.event;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetup;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@@ -23,9 +21,9 @@
 * @date: 2020年5月6日 下午1:51:23
 */
@Component
public class ZLMOnlineEventListener implements ApplicationListener<ZLMOnlineEvent> {
public class ZLMStatusEventListener {
    
    private final static Logger logger = LoggerFactory.getLogger(ZLMOnlineEventListener.class);
    private final static Logger logger = LoggerFactory.getLogger(ZLMStatusEventListener.class);
    @Autowired
    private IStreamPushService streamPushService;
@@ -33,9 +31,13 @@
    @Autowired
    private IStreamProxyService streamProxyService;
    @Autowired
    private IMediaServerService mediaServerService;
    private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
    @Override
    @Async
    @EventListener
    public void onApplicationEvent(ZLMOnlineEvent event) {
        logger.info("ZLM上线事件触发,ID:" + event.getMediaServerId());
@@ -43,4 +45,16 @@
        streamProxyService.zlmServerOnline(event.getMediaServerId());
    }
    @Async
    @EventListener
    public void onApplicationEvent(ZLMOfflineEvent event) {
        logger.info("ZLM离线事件触发,ID:" + event.getMediaServerId());
        // 处理ZLM离线
        mediaServerService.zlmServerOffline(event.getMediaServerId());
        streamProxyService.zlmServerOffline(event.getMediaServerId());
        streamPushService.zlmServerOffline(event.getMediaServerId());
        // TODO 处理对国标的影响
    }
}