Commit 0f18d4cbe1039681ff53288317465f1e6a587232
1 parent
e886aa48
修复redis推流设备推送bug
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 { | @@ -88,7 +88,8 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { | ||
| 88 | streamPushItemForSave.add(streamPushItem); | 88 | streamPushItemForSave.add(streamPushItem); |
| 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 | GbStream gbStream = allGBId.get(streamPushItem.getGbId()); | 93 | GbStream gbStream = allGBId.get(streamPushItem.getGbId()); |
| 93 | logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}", | 94 | logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}", |
| 94 | streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); | 95 | streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); |