修复redis推流设备推送bug

648540858
1 parent e886aa48
Showing 1 changed file with 2 additions and 1 deletions
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java
@@ -88,7 +88,8 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener {
                                 streamPushItemForSave.add(streamPushItem);
                                 allGBId.put(streamPushItem.getGbId(), streamPushItem);
                             } else {
-                                if (allGBId.containsKey(streamPushItem.getGbId())) {
+                                if (allGBId.containsKey(streamPushItem.getGbId())
+                                        && (allGBId.get(streamPushItem.getGbId()).getApp().equals(streamPushItem.getApp()) || allGBId.get(streamPushItem.getGbId()).getStream().equals(streamPushItem.getStream()))) {
                                     GbStream gbStream = allGBId.get(streamPushItem.getGbId());
                                     logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}",
                                             streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream());