diff --git a/jsowell-common/src/main/java/com/jsowell/common/YouDianUtils.java b/jsowell-common/src/main/java/com/jsowell/common/YouDianUtils.java index a1d1d61f0..ef2a7a75c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/YouDianUtils.java +++ b/jsowell-common/src/main/java/com/jsowell/common/YouDianUtils.java @@ -62,7 +62,7 @@ public class YouDianUtils { // 取累加和的低 2 字节(16 位) int i = sum & 0xFFFF; - log.info("计算校验字段:{}", i); + // log.info("计算校验字段:{}", i); return i; } diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/ChannelManagerUtil.java b/jsowell-common/src/main/java/com/jsowell/common/util/ChannelManagerUtil.java index 0dd81dde1..f171f4630 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/ChannelManagerUtil.java +++ b/jsowell-common/src/main/java/com/jsowell/common/util/ChannelManagerUtil.java @@ -39,6 +39,9 @@ public class ChannelManagerUtil { * @param channelId 通道 ID */ public static void removeChannel(String channelId) { + if (!channelMap.containsKey(channelId)) { + return; + } channelMap.remove(channelId); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java index 0877f53b5..4f97f467b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java @@ -2,17 +2,18 @@ package com.jsowell.netty.server.electricbicycles; import com.alibaba.fastjson2.JSON; import com.google.common.collect.Lists; +import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.util.BytesUtil; +import com.jsowell.common.util.ChannelManagerUtil; import com.jsowell.netty.service.electricbicycles.EBikeBusinessService; import io.netty.buffer.ByteBuf; -import io.netty.channel.Channel; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.channel.*; +import io.netty.handler.timeout.ReadTimeoutException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.net.InetSocketAddress; import java.util.List; import java.util.Map; import java.util.Objects; @@ -23,7 +24,7 @@ import java.util.concurrent.TimeUnit; @ChannelHandler.Sharable @Slf4j @Component -public class ElectricBicyclesServerHandler extends SimpleChannelInboundHandler { +public class ElectricBicyclesServerHandler extends ChannelInboundHandlerAdapter { private final Map responseFutureMap = new ConcurrentHashMap<>(); @@ -32,8 +33,33 @@ public class ElectricBicyclesServerHandler extends SimpleChannelInboundHandler