From ba40605af78670b80987630ededea5f5bb32044b Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 2 Jul 2025 11:54:57 +0800 Subject: [PATCH] update --- .../com/jsowell/common/util/YKCUtils.java | 2 +- .../yunkuaichong/AbstractYkcHandler.java | 2 +- .../yunkuaichong/NettyServerHandler.java | 2 +- .../impl/YKCBusinessServiceImpl.java | 2 +- .../impl/YKCPushCommandServiceImpl.java | 32 +++++++++---------- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java index f9df62675..0f3b94334 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java @@ -214,7 +214,7 @@ public class YKCUtils { // 保存桩号和channel的关系 PileChannelEntity.checkChannel(pileSn, ctx); - PileChannelEntity.checkChannelV2(pileSn, ctx); + // PileChannelEntity.checkChannelV2(pileSn, ctx); } /** diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractYkcHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractYkcHandler.java index bce97a1b4..c949ad9a7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractYkcHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractYkcHandler.java @@ -70,7 +70,7 @@ public abstract class AbstractYkcHandler implements InitializingBean { // 保存桩号和channel的关系 PileChannelEntity.checkChannel(pileSn, ctx); - PileChannelEntity.checkChannelV2(pileSn, ctx); + // PileChannelEntity.checkChannelV2(pileSn, ctx); } /** diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java index a259fba02..52ebf0297 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/yunkuaichong/NettyServerHandler.java @@ -307,7 +307,7 @@ public class NettyServerHandler extends ChannelInboundHandlerAdapter { } log.error("【{}】发生了错误, pileSn:【{}】此连接被关闭, 此时连通数量: {}", channelId, pileSn, CHANNEL_MAP.size()); // 删除连接 - PileChannelEntity.deleteChannel(pileSn, ctx); + // PileChannelEntity.deleteChannel(pileSn, ctx); ctx.channel().close(); } } finally { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java index c5be569bf..6dc28ffec 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java @@ -88,7 +88,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ""); // 删除连接 - PileChannelEntity.deleteChannel(pileSn, ctx); + // PileChannelEntity.deleteChannel(pileSn, ctx); // 删除桩编号和channel的关系 // PileChannelEntity.removeByPileSn(pileSn); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java index 3787221f1..24aa11377 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/YKCPushCommandServiceImpl.java @@ -126,14 +126,14 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { log.error("push发送命令失败, pileSn:{}", pileSn, cause); // 异步删除Map中的保存关系(带关闭连接) - CompletableFuture.runAsync(() -> { - try { - // 删除Map中的保存关系 - PileChannelEntity.deleteChannel(pileSn, ctx); - } catch (Exception e) { - log.error("异步删除、关闭连接 error", e); - } - }, executor); + // CompletableFuture.runAsync(() -> { + // try { + // // 删除Map中的保存关系 + // PileChannelEntity.deleteChannel(pileSn, ctx); + // } catch (Exception e) { + // log.error("异步删除、关闭连接 error", e); + // } + // }, executor); } }); @@ -231,14 +231,14 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { log.error("push发送命令失败, pileSn:{}", pileSn, cause); // 异步删除Map中的保存关系(带关闭连接) - CompletableFuture.runAsync(() -> { - try { - // 删除Map中的保存关系 - PileChannelEntity.deleteChannel(pileSn, ctx); - } catch (Exception e) { - log.error("异步删除、关闭连接 error", e); - } - }, executor); + // CompletableFuture.runAsync(() -> { + // try { + // // 删除Map中的保存关系 + // PileChannelEntity.deleteChannel(pileSn, ctx); + // } catch (Exception e) { + // log.error("异步删除、关闭连接 error", e); + // } + // }, executor); } });