处理冲突

xiaoxie

2022-05-23 d739bfa5976e36ced26f906ab16f83c20c8cb27c

 src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java

@@ -7,12 +7,10 @@
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;

/**
 * @description: 在线事件监听器，监听到离线后，修改设备离在线状态。 设备在线有两个来源：
@@ -38,13 +36,10 @@
   @Autowired
   private IPlayService playService;

   private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

   @Async
   @EventListener
   public void onApplicationEvent(ZLMOnlineEvent event) {

      logger.info("ZLM上线事件触发，ID：" + event.getMediaServerId());
      logger.info("[ZLM] 上线 ID：" + event.getMediaServerId());
      streamPushService.zlmServerOnline(event.getMediaServerId());
      streamProxyService.zlmServerOnline(event.getMediaServerId());

@@ -54,7 +49,7 @@
   @EventListener
   public void onApplicationEvent(ZLMOfflineEvent event) {

      logger.info("ZLM离线事件触发，ID：" + event.getMediaServerId());
      logger.info("[ZLM] 离线，ID：" + event.getMediaServerId());
      // 处理ZLM离线
      mediaServerService.zlmServerOffline(event.getMediaServerId());
      streamProxyService.zlmServerOffline(event.getMediaServerId());