From bfc063e4f7393c27b92e642a3f71bcbc5ba5efec Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Mon, 19 May 2025 16:52:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=BF=87redis?= =?UTF-8?q?=E5=94=A4=E9=86=92=E6=8E=A8=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java | 5 ++--- .../streamPush/service/impl/StreamPushPlayServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java index f70a9e319..bc8b5f6a1 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/redis/RedisMsgListenConfig.java @@ -16,7 +16,7 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer; * @description:Redis中间件配置类，使用spring-data-redis集成，自动从application.yml中加载redis配置 * @author: swwheihei * @date: 2019年5月30日 上午10:58:25 - * + * */ @Configuration @Order(value=1) @@ -38,7 +38,6 @@ public class RedisMsgListenConfig { @Autowired private RedisCloseStreamMsgListener redisCloseStreamMsgListener; - @Autowired private RedisRpcConfig redisRpcConfig; @@ -49,7 +48,7 @@ public class RedisMsgListenConfig { /** * redis消息监听器容器 可以添加多个监听不同话题的redis监听器，只需要把消息监听器和相应的消息订阅处理器绑定，该消息监听器 * 通过反射技术调用消息订阅处理器的相关方法进行一些业务处理 - * + * * @param connectionFactory * @return */ diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushPlayServiceImpl.java index 6f44f36e8..653b97712 100644 --- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushPlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushPlayServiceImpl.java @@ -39,7 +39,7 @@ public class StreamPushPlayServiceImpl implements IStreamPushPlayService { @Autowired private UserSetting userSetting; - + @Autowired private DynamicTask dynamicTask; @@ -57,7 +57,7 @@ public class StreamPushPlayServiceImpl implements IStreamPushPlayService { StreamPush streamPush = streamPushMapper.queryOne(id); Assert.notNull(streamPush, "推流信息未找到"); - if (!userSetting.getServerId().equals(streamPush.getServerId())) { + if (streamPush.isPushing() && !userSetting.getServerId().equals(streamPush.getServerId())) { redisRpcPlayService.playPush(id, callback); return; }