优化代码，升级版本号为2.7.1

648540858

2024-04-09 54b878d2e1e089cdeb7a957b78aa1f4cbdd6da6c

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

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

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.UserSetting;

import com.genersoft.iot.vmp.media.zlm.ZLMMediaListManager;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +29,6 @@
    @Autowired
    private ZLMMediaListManager zlmMediaListManager;

    private boolean taskQueueHandlerRun = false;

    private ConcurrentLinkedQueue<Message> taskQueue = new ConcurrentLinkedQueue<>();

    @Qualifier("taskExecutor")
@@ -43,49 +37,52 @@

    @Override
    public void onMessage(Message message, byte[] bytes) {

        taskQueue.offer(message);
        if (!taskQueueHandlerRun) {
            taskQueueHandlerRun = true;
            taskExecutor.execute(() -> {
                while (!taskQueue.isEmpty()) {
                    Message msg = taskQueue.poll();
                    JSONObject steamMsgJson = JSON.parseObject(msg.getBody(), JSONObject.class);
                    if (steamMsgJson == null) {
                        logger.warn("[收到redis 流变化]消息解析失败");
                        continue;
                    }
                    String serverId = steamMsgJson.getString("serverId");

                    if (userSetting.getServerId().equals(serverId)) {
                        // 自己发送的消息忽略即可
                        continue;
                    }
                    logger.info("[收到redis 流变化]： {}", new String(message.getBody()));
                    String app = steamMsgJson.getString("app");
                    String stream = steamMsgJson.getString("stream");
                    boolean register = steamMsgJson.getBoolean("register");
                    String mediaServerId = steamMsgJson.getString("mediaServerId");
                    MediaItem mediaItem = new MediaItem();
                    mediaItem.setSeverId(serverId);
                    mediaItem.setApp(app);
                    mediaItem.setStream(stream);
                    mediaItem.setRegist(register);
                    mediaItem.setMediaServerId(mediaServerId);
                    mediaItem.setCreateStamp(System.currentTimeMillis()/1000);
                    mediaItem.setAliveSecond(0L);
                    mediaItem.setTotalReaderCount("0");
                    mediaItem.setOriginType(0);
                    mediaItem.setOriginTypeStr("0");
                    mediaItem.setOriginTypeStr("unknown");
                    if (register) {
                        zlmMediaListManager.addPush(mediaItem);
                    }else {
                        zlmMediaListManager.removeMedia(app, stream);
                    }
                }
                taskQueueHandlerRun = false;
            });
        }
//        boolean isEmpty = taskQueue.isEmpty();
//        taskQueue.offer(message);
//        if (isEmpty) {
//            taskExecutor.execute(() -> {
//                while (!taskQueue.isEmpty()) {
//                    Message msg = taskQueue.poll();
//                    try {
//                        JSONObject steamMsgJson = JSON.parseObject(msg.getBody(), JSONObject.class);
//                        if (steamMsgJson == null) {
//                            logger.warn("[收到redis 流变化]消息解析失败");
//                            continue;
//                        }
//                        String serverId = steamMsgJson.getString("serverId");
//
//                        if (userSetting.getServerId().equals(serverId)) {
//                            // 自己发送的消息忽略即可
//                            continue;
//                        }
//                        logger.info("[收到redis 流变化]： {}", new String(message.getBody()));
//                        String app = steamMsgJson.getString("app");
//                        String stream = steamMsgJson.getString("stream");
//                        boolean register = steamMsgJson.getBoolean("register");
//                        String mediaServerId = steamMsgJson.getString("mediaServerId");
//                        OnStreamChangedHookParam onStreamChangedHookParam = new OnStreamChangedHookParam();
//                        onStreamChangedHookParam.setSeverId(serverId);
//                        onStreamChangedHookParam.setApp(app);
//                        onStreamChangedHookParam.setStream(stream);
//                        onStreamChangedHookParam.setRegist(register);
//                        onStreamChangedHookParam.setMediaServerId(mediaServerId);
//                        onStreamChangedHookParam.setCreateStamp(System.currentTimeMillis()/1000);
//                        onStreamChangedHookParam.setAliveSecond(0L);
//                        onStreamChangedHookParam.setTotalReaderCount("0");
//                        onStreamChangedHookParam.setOriginType(0);
//                        onStreamChangedHookParam.setOriginTypeStr("0");
//                        onStreamChangedHookParam.setOriginTypeStr("unknown");
//                        if (register) {
//                            zlmMediaListManager.addPush(onStreamChangedHookParam);
//                        }else {
//                            zlmMediaListManager.removeMedia(app, stream);
//                        }
//                    }catch (Exception e) {
//                        logger.warn("[REDIS消息-流变化] 发现未处理的异常, \r\n{}", JSON.toJSONString(message));
//                        logger.error("[REDIS消息-流变化] 异常内容： ", e);
//                    }
//                }
//            });
//        }
    }
}