From 0a404e23896b566a4dc017431951f8b73578ed73 Mon Sep 17 00:00:00 2001
From: 百鸣 <94030128+ixingqiao@users.noreply.github.com>
Date: 星期五, 26 八月 2022 11:49:43 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/impl/RedisStreamMsgListener.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/RedisStreamMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/impl/RedisStreamMsgListener.java
index 72b3c4e..118a227 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/RedisStreamMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RedisStreamMsgListener.java
@@ -27,15 +27,6 @@
private final static Logger logger = LoggerFactory.getLogger(RedisStreamMsgListener.class);
@Autowired
- private ISIPCommander commander;
-
- @Autowired
- private ISIPCommanderForPlatform commanderForPlatform;
-
- @Autowired
- private IVideoManagerStorage storage;
-
- @Autowired
private UserSetting userSetting;
@Autowired
@@ -46,7 +37,7 @@
JSONObject steamMsgJson = JSON.parseObject(message.getBody(), JSONObject.class);
if (steamMsgJson == null) {
- logger.warn("[鏀跺埌 redis 娴佸彉鍖朷娑堟伅瑙ｆ瀽澶辫触");
+ logger.warn("[鏀跺埌redis 娴佸彉鍖朷娑堟伅瑙ｆ瀽澶辫触");
return;
}
String serverId = steamMsgJson.getString("serverId");
@@ -55,7 +46,7 @@
// 鑷繁鍙戦�佺殑娑堟伅蹇界暐鍗冲彲
return;
}
- logger.info("[鏀跺埌 redis 娴佸彉鍖朷锛� {}", new String(message.getBody()));
+ logger.info("[鏀跺埌redis 娴佸彉鍖朷锛� {}", new String(message.getBody()));
String app = steamMsgJson.getString("app");
String stream = steamMsgJson.getString("stream");
boolean register = steamMsgJson.getBoolean("register");
@@ -72,9 +63,10 @@
mediaItem.setOriginType(0);
mediaItem.setOriginTypeStr("0");
mediaItem.setOriginTypeStr("unknown");
-
- zlmMediaListManager.addPush(mediaItem);
-
-
+ if (register) {
+ zlmMediaListManager.addPush(mediaItem);
+ }else {
+ zlmMediaListManager.removeMedia(app, stream);
+ }
}
}
--
Gitblit v1.8.0