Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

xu-bin-bin

2023-10-24 ae9976bb3a59cc3d9952dda6d9388bb412baa158

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

old mode 100644
new mode 100755
@@ -1,8 +1,9 @@
package com.genersoft.iot.vmp.service.redisMsg;

import com.alibaba.fastjson.JSON;
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;
@@ -29,8 +30,6 @@

    private final static Logger logger = LoggerFactory.getLogger(RedisPushStreamStatusMsgListener.class);

    private boolean taskQueueHandlerRun = false;

    @Autowired
    private IRedisCatchStorage redisCatchStorage;

@@ -39,6 +38,9 @@

    @Autowired
    private DynamicTask dynamicTask;

    @Autowired
    private UserSetting userSetting;



@@ -50,50 +52,56 @@

    @Override
    public void onMessage(Message message, byte[] bytes) {
        boolean isEmpty = taskQueue.isEmpty();
        logger.warn("[REDIS消息-推流设备状态变化]： {}", new String(message.getBody()));
        taskQueue.offer(message);

        if (!taskQueueHandlerRun) {
            taskQueueHandlerRun = true;
        if (isEmpty) {
            taskExecutor.execute(() -> {
                while (!taskQueue.isEmpty()) {
                    Message msg = taskQueue.poll();
                    PushStreamStatusChangeFromRedisDto statusChangeFromPushStream = JSON.parseObject(msg.getBody(), PushStreamStatusChangeFromRedisDto.class);
                    if (statusChangeFromPushStream == null) {
                        logger.warn("[REDIS消息]推流设备状态变化消息解析失败");
                        continue;
                    }
                    // 取消定时任务
                    dynamicTask.stop(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED);
                    if (statusChangeFromPushStream.isSetAllOffline()) {
                        // 所有设备离线
                        streamPushService.allStreamOffline();
                    }
                    if (statusChangeFromPushStream.getOfflineStreams() != null
                            && statusChangeFromPushStream.getOfflineStreams().size() > 0) {
                        // 更新部分设备离线
                        streamPushService.offline(statusChangeFromPushStream.getOfflineStreams());
                    }
                    if (statusChangeFromPushStream.getOnlineStreams() != null &&
                            statusChangeFromPushStream.getOnlineStreams().size() > 0) {
                        // 更新部分设备上线
                        streamPushService.online(statusChangeFromPushStream.getOnlineStreams());
                    try {
                        PushStreamStatusChangeFromRedisDto statusChangeFromPushStream = JSON.parseObject(msg.getBody(), PushStreamStatusChangeFromRedisDto.class);
                        if (statusChangeFromPushStream == null) {
                            logger.warn("[REDIS消息]推流设备状态变化消息解析失败");
                            continue;
                        }
                        // 取消定时任务
                        dynamicTask.stop(VideoManagerConstants.VM_MSG_GET_ALL_ONLINE_REQUESTED);
                        if (statusChangeFromPushStream.isSetAllOffline()) {
                            // 所有设备离线
                            streamPushService.allStreamOffline();
                        }
                        if (statusChangeFromPushStream.getOfflineStreams() != null
                                && statusChangeFromPushStream.getOfflineStreams().size() > 0) {
                            // 更新部分设备离线
                            streamPushService.offline(statusChangeFromPushStream.getOfflineStreams());
                        }
                        if (statusChangeFromPushStream.getOnlineStreams() != null &&
                                statusChangeFromPushStream.getOnlineStreams().size() > 0) {
                            // 更新部分设备上线
                            streamPushService.online(statusChangeFromPushStream.getOnlineStreams());
                        }
                    }catch (Exception e) {
                        logger.warn("[REDIS消息-推流设备状态变化] 发现未处理的异常, \r\n{}", JSON.toJSONString(message));
                        logger.error("[REDIS消息-推流设备状态变化] 异常内容： ", e);
                    }
                }
                taskQueueHandlerRun = false;
            });
        }
    }

    @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);
        }
    }

}