Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-07-31 3cada227435934da8a2db49939695f870b7f477e

 src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusMsgListener.java

@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSON;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.service.bean.PushStreamStatusChangeFromRedisDto;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -37,6 +38,9 @@

    @Autowired
    private DynamicTask dynamicTask;

    @Autowired
    private UserSetting userSetting;



@@ -79,7 +83,8 @@
                            streamPushService.online(statusChangeFromPushStream.getOnlineStreams());
                        }
                    }catch (Exception e) {
                        logger.warn("[REDIS的ALARM通知] 发现未处理的异常, {}",e.getMessage());
                        logger.warn("[REDIS消息-推流设备状态变化] 发现未处理的异常, \r\n{}", JSON.toJSONString(message));
                        logger.error("[REDIS消息-推流设备状态变化] 异常内容： ", e);
                    }
                }
            });
@@ -88,13 +93,15 @@

    @Override
    public void run(ApplicationArguments args) throws Exception {
        //  启动时设置所有推流通道离线，发起查询请求
        redisCatchStorage.sendStreamPushRequestedMsgForStatus();
        dynamicTask.startDelay(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED, ()->{
            logger.info("[REDIS消息]未收到redis回复推流设备状态，执行推流设备离线");
            // 五秒收不到请求就设置通道离线，然后通知上级离线
            streamPushService.allStreamOffline();
        }, 5000);
        if (!userSetting.isUsePushingAsStatus()) {
            //  启动时设置所有推流通道离线，发起查询请求
            redisCatchStorage.sendStreamPushRequestedMsgForStatus();
            dynamicTask.startDelay(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED, ()->{
                logger.info("[REDIS消息]未收到redis回复推流设备状态，执行推流设备离线");
                // 五秒收不到请求就设置通道离线，然后通知上级离线
                streamPushService.allStreamOffline();
            }, 5000);
        }
    }

}