Commit dc8869be4972b35e4f5a045cb5408ae01f2aad14
1 parent
e1d476a5
优化收到redis推动的推流设备信息更新内容重复的问题
Showing
1 changed file
with
7 additions
and
1 deletions
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java
| @@ -75,7 +75,7 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { | @@ -75,7 +75,7 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { | ||
| 75 | if (!contains) { | 75 | if (!contains) { |
| 76 | if (allGBId.containsKey(streamPushItem.getGbId())) { | 76 | if (allGBId.containsKey(streamPushItem.getGbId())) { |
| 77 | GbStream gbStream = allGBId.get(streamPushItem.getGbId()); | 77 | GbStream gbStream = allGBId.get(streamPushItem.getGbId()); |
| 78 | - logger.warn("[REDIS消息-推流设备列表更新] 国标编号重复: {}, 已分配给{}/{}", | 78 | + logger.warn("[REDIS消息-推流设备列表更新-INSERT] 国标编号重复: {}, 已分配给{}/{}", |
| 79 | streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); | 79 | streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); |
| 80 | continue; | 80 | continue; |
| 81 | } | 81 | } |
| @@ -88,6 +88,12 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { | @@ -88,6 +88,12 @@ 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())) { | ||
| 92 | + GbStream gbStream = allGBId.get(streamPushItem.getGbId()); | ||
| 93 | + logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}", | ||
| 94 | + streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); | ||
| 95 | + continue; | ||
| 96 | + } | ||
| 91 | //存在就只修改 name和gbId | 97 | //存在就只修改 name和gbId |
| 92 | streamPushItemForUpdate.add(streamPushItem); | 98 | streamPushItemForUpdate.add(streamPushItem); |
| 93 | } | 99 | } |