From 887dcca0f9c21cc1d78dc414ea261455f547f716 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 18 Nov 2023 08:31:31 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=A1=E9=AA=8Cchannel=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/ykc/PileChannelEntity.java | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileChannelEntity.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileChannelEntity.java index d0da37c53..22cd31e49 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileChannelEntity.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/PileChannelEntity.java @@ -22,27 +22,29 @@ public class PileChannelEntity { * 校验channel是否保存 */ public static void checkChannel(String pileSn, Channel channel) { - if (manager.containsKey(pileSn)) { - // 如果manager中存在pileSn的连接，取出来对比 - Channel sourceChannel = manager.get(pileSn); - if (sourceChannel != null) { - // 两个做对比 - String sourceChannelId = sourceChannel.id().asLongText(); - String channelId = channel.id().asLongText(); - if (!StringUtils.equals(sourceChannelId, channelId)) { - // 不一致则更新 - log.info("checkChannel-manager中pileSn:{}的连接不一致, 老channelId:{}, 保存新的channel:{}", pileSn, sourceChannelId, channelId); - manager.put(pileSn, channel); - } - } else { - // 为空就put - log.info("checkChannel-manager中pileSn:{}的连接为空,保存新的channel:{}", pileSn, channel.id().asLongText()); - manager.put(pileSn, channel); - } - } else { + if (!manager.containsKey(pileSn)) { // 如果manager中不存在pileSn的连接，则保存 log.info("checkChannel-manager中不存在pileSn:{}的连接,保存新的channel:{}", pileSn, channel.id().asLongText()); manager.put(pileSn, channel); + return; + } + + // 如果manager中存在pileSn的连接，取出来对比 + Channel sourceChannel = manager.get(pileSn); + if (sourceChannel == null) { + // 为空就put + log.info("checkChannel-manager中pileSn:{}的连接为空,保存新的channel:{}", pileSn, channel.id().asLongText()); + manager.put(pileSn, channel); + return; + } + + // 两个做对比 + String sourceChannelId = sourceChannel.id().asLongText(); + String channelId = channel.id().asLongText(); + if (!StringUtils.equals(sourceChannelId, channelId)) { + // 不一致则更新 + log.info("checkChannel-manager中pileSn:{}的连接不一致, 老channelId:{}, 保存新的channel:{}", pileSn, sourceChannelId, channelId); + manager.put(pileSn, channel); } }