From b225b535102ca8d917a4a64765a04566211a7c0a Mon Sep 17 00:00:00 2001 From: chenjialing <595168663@qq.com> Date: 星期四, 03 三月 2022 15:30:16 +0800 Subject: [PATCH] fixed--多节点管理zlm,wvp重启之后节点中的redis在线状态bug修复 --- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 1 + src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 9 ++++----- src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java index de5d483..9d0e354 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java @@ -92,6 +92,7 @@ // 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺� List<MediaServerItem> all = mediaServerService.getAllFromDatabase(); + mediaServerService.updateVmServer(all); if (all.size() == 0) { all.add(mediaConfig.getMediaSerItem()); } diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java index ec2714f..5eb1e81 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java @@ -42,6 +42,8 @@ void setZLMConfig(MediaServerItem mediaServerItem, boolean restart); + void updateVmServer(List<MediaServerItem> mediaServerItemList); + SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId); SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean isPlayback); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index 159cd05..0306a27 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -46,8 +46,7 @@ * 濯掍綋鏈嶅姟鍣ㄨ妭鐐圭鐞� */ @Service -@Order(value=2) -public class MediaServerServiceImpl implements IMediaServerService, CommandLineRunner { +public class MediaServerServiceImpl implements IMediaServerService { private final static Logger logger = LoggerFactory.getLogger(MediaServerServiceImpl.class); @@ -102,9 +101,8 @@ * 鍒濆鍖� */ @Override - public void run(String... args) throws Exception { + public void updateVmServer(List<MediaServerItem> mediaServerItemList) { logger.info("[缂撳瓨鍒濆鍖朷 Media Server "); - List<MediaServerItem> mediaServerItemList = mediaServerMapper.queryAll(); for (MediaServerItem mediaServerItem : mediaServerItemList) { if (StringUtils.isEmpty(mediaServerItem.getId())) { continue; @@ -224,7 +222,8 @@ String key = (String) mediaServerKey; MediaServerItem mediaServerItem = (MediaServerItem) redisUtil.get(key); // 妫�鏌ョ姸鎬� - if (redisUtil.zScore(onlineKey, mediaServerItem.getId()) != null) { + Double aDouble = redisUtil.zScore(onlineKey, mediaServerItem.getId()); + if (aDouble != null) { mediaServerItem.setStatus(true); } result.add(mediaServerItem); -- Gitblit v1.8.0