Commit a2b1065fe9aea25b82b756580ff3379ac4378ad1

Authored by 648540858
1 parent 0f18d4cb

修复redis推流设备推送bug

src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java
@@ -89,7 +89,7 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { @@ -89,7 +89,7 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener {
89 allGBId.put(streamPushItem.getGbId(), streamPushItem); 89 allGBId.put(streamPushItem.getGbId(), streamPushItem);
90 } else { 90 } else {
91 if (allGBId.containsKey(streamPushItem.getGbId()) 91 if (allGBId.containsKey(streamPushItem.getGbId())
92 - && (allGBId.get(streamPushItem.getGbId()).getApp().equals(streamPushItem.getApp()) || allGBId.get(streamPushItem.getGbId()).getStream().equals(streamPushItem.getStream()))) { 92 + && (!allGBId.get(streamPushItem.getGbId()).getApp().equals(streamPushItem.getApp()) || !allGBId.get(streamPushItem.getGbId()).getStream().equals(streamPushItem.getStream()))) {
93 GbStream gbStream = allGBId.get(streamPushItem.getGbId()); 93 GbStream gbStream = allGBId.get(streamPushItem.getGbId());
94 logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}", 94 logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}",
95 streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); 95 streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream());