From c16081fedad432740f20165e2dc8b940032cee57 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 1 Aug 2024 10:54:13 +0800 Subject: [PATCH 1/5] rpc --- .../java/com/jsowell/netty}/rpc/ClientChannelInitializer.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/Message.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/MessageConstant.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/MessageDecode.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/MessageEncode.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/RpcClient.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/RpcRequest.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/RpcRequestHandler.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/RpcResponse.java | 2 +- .../main/java/com/jsowell/netty}/rpc/RpcResponseHandler.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/RpcServer.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/RpcUtil.java | 2 +- .../java/com/jsowell/netty}/rpc/ServerChannelInitializer.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/SyncPromise.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/TestRpcClient.java | 2 +- .../src/main/java/com/jsowell/netty}/rpc/TestRpcServer.java | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/ClientChannelInitializer.java (94%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/Message.java (76%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/MessageConstant.java (94%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/MessageDecode.java (97%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/MessageEncode.java (96%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcClient.java (97%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcRequest.java (91%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcRequestHandler.java (97%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcResponse.java (89%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcResponseHandler.java (95%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcServer.java (98%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/RpcUtil.java (98%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/ServerChannelInitializer.java (94%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/SyncPromise.java (97%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/TestRpcClient.java (98%) rename {jsowell-admin/src/test/java => jsowell-netty/src/main/java/com/jsowell/netty}/rpc/TestRpcServer.java (79%) diff --git a/jsowell-admin/src/test/java/rpc/ClientChannelInitializer.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/ClientChannelInitializer.java similarity index 94% rename from jsowell-admin/src/test/java/rpc/ClientChannelInitializer.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/ClientChannelInitializer.java index d086c5383..4c1f813f3 100644 --- a/jsowell-admin/src/test/java/rpc/ClientChannelInitializer.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/ClientChannelInitializer.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/jsowell-admin/src/test/java/rpc/Message.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/Message.java similarity index 76% rename from jsowell-admin/src/test/java/rpc/Message.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/Message.java index 3323b79ea..0b733044e 100644 --- a/jsowell-admin/src/test/java/rpc/Message.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/Message.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import lombok.Data; diff --git a/jsowell-admin/src/test/java/rpc/MessageConstant.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageConstant.java similarity index 94% rename from jsowell-admin/src/test/java/rpc/MessageConstant.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageConstant.java index f3f78453b..930cab4b8 100644 --- a/jsowell-admin/src/test/java/rpc/MessageConstant.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageConstant.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/jsowell-admin/src/test/java/rpc/MessageDecode.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageDecode.java similarity index 97% rename from jsowell-admin/src/test/java/rpc/MessageDecode.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageDecode.java index 083f43166..d391a2943 100644 --- a/jsowell-admin/src/test/java/rpc/MessageDecode.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageDecode.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import com.jsowell.common.util.bean.SerializationUtil; import io.netty.buffer.ByteBuf; diff --git a/jsowell-admin/src/test/java/rpc/MessageEncode.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageEncode.java similarity index 96% rename from jsowell-admin/src/test/java/rpc/MessageEncode.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageEncode.java index 338a74ac3..b96edcb01 100644 --- a/jsowell-admin/src/test/java/rpc/MessageEncode.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/MessageEncode.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import com.jsowell.common.util.bean.SerializationUtil; import io.netty.buffer.ByteBuf; diff --git a/jsowell-admin/src/test/java/rpc/RpcClient.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcClient.java similarity index 97% rename from jsowell-admin/src/test/java/rpc/RpcClient.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcClient.java index 92b615f73..2caefc9ae 100644 --- a/jsowell-admin/src/test/java/rpc/RpcClient.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcClient.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; diff --git a/jsowell-admin/src/test/java/rpc/RpcRequest.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequest.java similarity index 91% rename from jsowell-admin/src/test/java/rpc/RpcRequest.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequest.java index f55e85b71..8ffc0fcfb 100644 --- a/jsowell-admin/src/test/java/rpc/RpcRequest.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequest.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import lombok.Data; import lombok.ToString; diff --git a/jsowell-admin/src/test/java/rpc/RpcRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequestHandler.java similarity index 97% rename from jsowell-admin/src/test/java/rpc/RpcRequestHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequestHandler.java index 74b432bca..59c034caf 100644 --- a/jsowell-admin/src/test/java/rpc/RpcRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcRequestHandler.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.DefaultEventLoopGroup; diff --git a/jsowell-admin/src/test/java/rpc/RpcResponse.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponse.java similarity index 89% rename from jsowell-admin/src/test/java/rpc/RpcResponse.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponse.java index 43e5a7ad8..075ae9186 100644 --- a/jsowell-admin/src/test/java/rpc/RpcResponse.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponse.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import lombok.Data; import lombok.ToString; diff --git a/jsowell-admin/src/test/java/rpc/RpcResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponseHandler.java similarity index 95% rename from jsowell-admin/src/test/java/rpc/RpcResponseHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponseHandler.java index 085c5bf31..d98837b8a 100644 --- a/jsowell-admin/src/test/java/rpc/RpcResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcResponseHandler.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; diff --git a/jsowell-admin/src/test/java/rpc/RpcServer.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcServer.java similarity index 98% rename from jsowell-admin/src/test/java/rpc/RpcServer.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcServer.java index a1b55da49..ab72fbabe 100644 --- a/jsowell-admin/src/test/java/rpc/RpcServer.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcServer.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; diff --git a/jsowell-admin/src/test/java/rpc/RpcUtil.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcUtil.java similarity index 98% rename from jsowell-admin/src/test/java/rpc/RpcUtil.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcUtil.java index 5d8c4bf89..cc85f8581 100644 --- a/jsowell-admin/src/test/java/rpc/RpcUtil.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/RpcUtil.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.channel.Channel; diff --git a/jsowell-admin/src/test/java/rpc/ServerChannelInitializer.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/ServerChannelInitializer.java similarity index 94% rename from jsowell-admin/src/test/java/rpc/ServerChannelInitializer.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/ServerChannelInitializer.java index 283d00b5d..36858b982 100644 --- a/jsowell-admin/src/test/java/rpc/ServerChannelInitializer.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/ServerChannelInitializer.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/jsowell-admin/src/test/java/rpc/SyncPromise.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/SyncPromise.java similarity index 97% rename from jsowell-admin/src/test/java/rpc/SyncPromise.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/SyncPromise.java index 4bcdb13fa..41ef7b322 100644 --- a/jsowell-admin/src/test/java/rpc/SyncPromise.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/SyncPromise.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/jsowell-admin/src/test/java/rpc/TestRpcClient.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcClient.java similarity index 98% rename from jsowell-admin/src/test/java/rpc/TestRpcClient.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcClient.java index aeba06cbb..b239e92a3 100644 --- a/jsowell-admin/src/test/java/rpc/TestRpcClient.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcClient.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; import java.util.concurrent.TimeUnit; diff --git a/jsowell-admin/src/test/java/rpc/TestRpcServer.java b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcServer.java similarity index 79% rename from jsowell-admin/src/test/java/rpc/TestRpcServer.java rename to jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcServer.java index c15d9e211..b346613c0 100644 --- a/jsowell-admin/src/test/java/rpc/TestRpcServer.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/rpc/TestRpcServer.java @@ -1,4 +1,4 @@ -package rpc; +package com.jsowell.netty.rpc; public class TestRpcServer { public static void main(String[] args) { From 10998746661e723a01bbe51feb41374e054a1f9a Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 1 Aug 2024 11:34:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8ChannelHandlerContext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../netty/handler/yunkuaichong/AbstractHandler.java | 13 +++++++++++++ .../BMSAbortDuringChargingPhaseHandler.java | 3 ++- .../BMSDemandAndChargerOutputHandler.java | 3 ++- .../handler/yunkuaichong/BMSInformationHandler.java | 3 ++- .../yunkuaichong/BillingTemplateRequestHandler.java | 5 +++-- .../BillingTemplateResponseHandler.java | 5 +++-- .../yunkuaichong/BillingTemplateSettingHandler.java | 3 ++- .../BillingTemplateValidateRequestHandler.java | 3 ++- .../handler/yunkuaichong/ChargeEndHandler.java | 3 ++- .../ChargerAbortedDuringChargingPhaseHandler.java | 3 ++- .../yunkuaichong/ChargingHandshakeHandler.java | 3 ++- .../ConfirmStartChargingRequestHandler.java | 3 ++- .../handler/yunkuaichong/ErrorMessageHandler.java | 3 ++- .../yunkuaichong/GroundLockDataUploadHandler.java | 3 ++- .../yunkuaichong/HeartbeatRequestHandler.java | 3 ++- .../handler/yunkuaichong/LoginRequestHandler.java | 3 ++- .../OfflineCardDataCleaningHandler.java | 3 ++- .../OfflineCardDataCleaningResponseHandler.java | 3 ++- .../yunkuaichong/OfflineCardDataQueryHandler.java | 3 ++- .../OfflineCardDataQueryResponseHandler.java | 3 ++- .../OfflineCardDataSynchronizationHandler.java | 3 ++- ...flineCardDataSynchronizationResponseHandler.java | 3 ++- .../yunkuaichong/ParameterConfigurationHandler.java | 3 ++- .../PileWorkingParameterSettingHandler.java | 3 ++- .../PileWorkingParameterSettingResponseHandler.java | 3 ++- .../yunkuaichong/QueryPileWorkParamsHandler.java | 3 ++- .../ReadRealTimeMonitorDataHandler.java | 3 ++- .../RemoteAccountBalanceUpdateRequestHandler.java | 3 ++- .../RemoteControlGroundLockHandler.java | 3 ++- .../RemoteControlGroundLockResponseHandler.java | 3 ++- .../yunkuaichong/RemoteIssuedQrCodeHandler.java | 3 ++- .../RemoteIssuedQrCodeResponseHandler.java | 3 ++- .../handler/yunkuaichong/RemoteRestartHandler.java | 3 ++- .../yunkuaichong/RemoteRestartResponseHandler.java | 3 ++- .../RemoteStartChargingRequestHandler.java | 3 ++- .../RemoteStopChargingRequestHandler.java | 3 ++- .../handler/yunkuaichong/RemoteUpdateHandler.java | 3 ++- .../yunkuaichong/RemoteUpdateResponseHandler.java | 3 ++- .../ReservationChargingResponseHandler.java | 3 ++- .../ReservationChargingStartupResultHandler.java | 3 ++- .../yunkuaichong/SettingPileWorkParamsHandler.java | 3 ++- .../yunkuaichong/TimeCheckSettingHandler.java | 3 ++- .../TimeCheckSettingResponseHandler.java | 5 +++-- .../TransactionRecordsRequestHandler.java | 3 ++- .../yunkuaichong/UploadRealTimeMonitorHandler.java | 3 ++- .../ElectricBicyclesServerHandler.java | 2 +- .../server/yunkuaichong/NettyServerHandler.java | 2 +- .../service/yunkuaichong/YKCBusinessService.java | 5 +++-- .../yunkuaichong/impl/YKCBusinessServiceImpl.java | 5 +++-- 49 files changed, 112 insertions(+), 53 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java index 98d2ba71d..ea23ba298 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java @@ -10,6 +10,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.CRC16Util; import com.jsowell.common.util.DateUtils; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; @@ -29,6 +30,10 @@ public abstract class AbstractHandler implements InitializingBean { throw new UnsupportedOperationException(); } + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { + throw new UnsupportedOperationException(); + } + /** * 执行逻辑 * 不需要应答 @@ -80,6 +85,14 @@ public abstract class AbstractHandler implements InitializingBean { PileChannelEntity.checkChannel(pileSn, channel); } + protected void saveLastTimeAndCheckChannel(String pileSn, ChannelHandlerContext ctx) { + String redisKey = CacheConstants.PILE_LAST_CONNECTION + pileSn; + redisCache.setCacheObject(redisKey, DateUtils.getDateTime(), CacheConstants.cache_expire_time_1d); + + // 保存桩号和channel的关系 + PileChannelEntity.checkChannel(pileSn, ctx.channel()); + } + /** * 阻止重复帧 * @return true 重复 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java index 8f52fc771..8d23d2a67 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class BMSAbortDuringChargingPhaseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电阶段 BMS 中止===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java index 0d82fbf28..829905c9b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class BMSDemandAndChargerOutputHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电过程 BMS 需求与充电机输出===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java index 96074b005..a3dcdb527 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class BMSInformationHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电过程 BMS 信息===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java index 8acb5bb1f..79484a303 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java @@ -9,6 +9,7 @@ import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.vo.web.BillingTemplateVO; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,7 +38,7 @@ public class BillingTemplateRequestHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { // log.info("[===执行计费模板请求逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体（此请求消息体只有桩编码） byte[] pileSnByte = ykcDataProtocol.getMsgBody(); @@ -45,7 +46,7 @@ public class BillingTemplateRequestHandler extends AbstractHandler{ // log.info("桩号：{}", pileSn); // 保存时间 - saveLastTimeAndCheckChannel(pileSn, channel); + saveLastTimeAndCheckChannel(pileSn, ctx); // 根据桩号查询计费模板 BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java index d2b46d928..347ac0617 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class BillingTemplateResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { // log.info("[===执行计费模型设置应答逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); @@ -36,7 +37,7 @@ public class BillingTemplateResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTimeAndCheckChannel(pileSn, channel); + saveLastTimeAndCheckChannel(pileSn, ctx); // 设置结果 0x00 失败 0x01 成功 byte[] settingResultByteArr = BytesUtil.copyBytes(msgBody, 7, 1); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java index 05b322e7d..c303f4b08 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class BillingTemplateSettingHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { // log.info("[===执行计费模型设置逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java index 9230fe7a1..8f07ca078 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java @@ -10,6 +10,7 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -38,7 +39,7 @@ public class BillingTemplateValidateRequestHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===执行计费模板验证请求逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java index f19117db6..d04a751f6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java @@ -9,6 +9,7 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.OrderBasicInfoService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,7 +38,7 @@ public class ChargeEndHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===执行充电结束逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java index 9db4000ee..23186c12a 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class ChargerAbortedDuringChargingPhaseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电阶段充电机中止===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java index 581fa17e2..56f4b57cd 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class ChargingHandshakeHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===执行充电握手逻辑===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java index 79eb51179..028cd2a4c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java @@ -22,6 +22,7 @@ import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.PileAuthCardService; import com.jsowell.pile.service.PileMsgRecordService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -58,7 +59,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电桩主动申请启动充电===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java index 632e31866..472938ae0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class ErrorMessageHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===错误报文===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java index 423024bf1..c845e6a4b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java @@ -19,6 +19,7 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.service.OrderPileOccupyService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -51,7 +52,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===地锁数据上送===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java index cbd5f7b8d..8b10a743c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java @@ -9,6 +9,7 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.service.PileBasicInfoService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,7 +32,7 @@ public class HeartbeatRequestHandler extends AbstractHandler { } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电桩心跳包===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java index cd5908247..dcb169025 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java @@ -18,6 +18,7 @@ import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -105,7 +106,7 @@ public class LoginRequestHandler extends AbstractHandler { } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java index 5dff7296c..67af8e05e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class OfflineCardDataCleaningHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===离线卡数据清除===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java index 6bce8a7dc..33b05d3d7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class OfflineCardDataCleaningResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===离线卡数据清除应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java index ed2e88815..9240e6c56 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -28,7 +29,7 @@ public class OfflineCardDataQueryHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===离线卡数据查询===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java index 05648b774..bd3dc4602 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class OfflineCardDataQueryResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===离线卡数据查询应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java index 83f79c05b..d6bb1ee92 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -28,7 +29,7 @@ public class OfflineCardDataSynchronizationHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===离线卡数据同步===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java index 5ae46a420..f3ddbd774 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class OfflineCardDataSynchronizationResponseHandler extends AbstractHandl } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===离线卡数据同步应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); //消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java index 1e8dee24b..ca1512b6b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java @@ -8,6 +8,7 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.OrderBasicInfoService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -35,7 +36,7 @@ public class ParameterConfigurationHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===参数配置===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java index 5b2d5956e..7076826b7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -28,7 +29,7 @@ public class PileWorkingParameterSettingHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电桩工作参数设置===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java index 0a798ff90..4ef45e0f9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class PileWorkingParameterSettingResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电桩工作参数设置应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java index ce9b4c44d..4fe914e74 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class QueryPileWorkParamsHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[====充电桩査询工作参数回复====] param:{}", JSON.toJSONString(ykcDataProtocol)); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java index 434cc3eae..e5aa93a55 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java @@ -9,6 +9,7 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.service.impl.YKCPushCommandServiceImpl; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -32,7 +33,7 @@ public class ReadRealTimeMonitorDataHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===读取实时监测数据===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java index a10b2f09c..7cdceccf6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class RemoteAccountBalanceUpdateRequestHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===余额更新应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java index 73a99c555..55538c1d1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class RemoteControlGroundLockHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===遥控地锁升锁与降锁命令===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java index fb84d37af..7995913ac 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java @@ -7,6 +7,7 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.service.OrderPileOccupyService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,7 +35,7 @@ public class RemoteControlGroundLockResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===充电桩返回遥控地锁升锁与降锁数据（上行）===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java index 356445c0c..bb347dfa6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java @@ -8,6 +8,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -33,7 +34,7 @@ public class RemoteIssuedQrCodeHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===后台远程下发二维码前缀指令===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编码 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java index 15f99825a..46f5808ff 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class RemoteIssuedQrCodeResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===桩应答远程下发二维码前缀指令===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java index 640b9058d..ef1e9a7e8 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -28,7 +29,7 @@ public class RemoteRestartHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===远程重启===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java index 979d32dec..da7f89c56 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java @@ -8,6 +8,7 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.service.PileMsgRecordService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -32,7 +33,7 @@ public class RemoteRestartResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===远程重启应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java index 518323d67..22fc90e75 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java @@ -12,6 +12,7 @@ import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.thirdparty.common.CommonService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -41,7 +42,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===远程启动充电命令回复===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java index f17e573dd..74968ddbd 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java @@ -11,6 +11,7 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.service.OrderBasicInfoService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,7 +38,7 @@ public class RemoteStopChargingRequestHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===远程停机命令回复===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java index 3e2e1c7e7..878e801f0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -28,7 +29,7 @@ public class RemoteUpdateHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===远程更新===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java index d82100b88..5b35f04e4 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class RemoteUpdateResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[====远程更新应答====] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingResponseHandler.java index 4af5d49e0..c70763e74 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingResponseHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -24,7 +25,7 @@ public class ReservationChargingResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[====远程更新应答====] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java index 041b1b9c4..badcd2d5d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingStartupResultHandler.java @@ -11,6 +11,7 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.dto.ReservationChargingStartupResult; import com.jsowell.pile.service.PileBasicInfoService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -33,7 +34,7 @@ public class ReservationChargingStartupResultHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { log.info("[===预约充电启动结果上送===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java index 51e265d3c..c69ca20fd 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java @@ -6,6 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -26,7 +27,7 @@ public class SettingPileWorkParamsHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[====平台设置工作参数回复====] param:{}", JSON.toJSONString(ykcDataProtocol)); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java index 838495498..271b46c2d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java @@ -5,6 +5,7 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -27,7 +28,7 @@ public class TimeCheckSettingHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===对时设置===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 下发 // 桩编号 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java index 9103dbd09..564916b03 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java @@ -8,6 +8,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -30,7 +31,7 @@ public class TimeCheckSettingResponseHandler extends AbstractHandler{ } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===对时设置应答===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); @@ -50,7 +51,7 @@ public class TimeCheckSettingResponseHandler extends AbstractHandler{ length = 7; byte[] currentTimeByteArr = BytesUtil.copyBytes(msgBody, startIndex, length); Date date = Cp56Time2aUtil.byte2Hdate(currentTimeByteArr); - log.info("对时设置应答, pileSn:{}, channelId:{}, 充电桩当前时间:{}", pileSn, channel.id().asShortText(), DateUtils.formatDateTime(date)); + log.info("对时设置应答, pileSn:{}, channelId:{}, 充电桩当前时间:{}", pileSn, channel.channel().id().asShortText(), DateUtils.formatDateTime(date)); return null; } } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java index 7bf8a722c..f9ce58077 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java @@ -23,6 +23,7 @@ import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.thirdparty.common.CommonService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -321,7 +322,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { }*/ @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===交易记录===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java index 20fa50903..3cf942803 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java @@ -18,6 +18,7 @@ import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.thirdparty.common.CommonService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -59,7 +60,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { // log.info("[===获取桩上传的实时监测数据===] param:{}, channel:{}", JSON.toJSONString(ykcDataProtocol), channel.toString()); RealTimeMonitorData realTimeMonitorData = new RealTimeMonitorData(); 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 159861ffa..375c8c6d0 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 @@ -92,7 +92,7 @@ public class ElectricBicyclesServerHandler extends ChannelInboundHandlerAdapter } // 处理数据 - byte[] response = ykcService.process(msg, channel); + byte[] response = ykcService.process(msg, ctx); if (Objects.nonNull(response)) { // 响应客户端 ByteBuf buffer = ctx.alloc().buffer().writeBytes(response); 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 35c668f62..1ef059718 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 @@ -92,7 +92,7 @@ public class NettyServerHandler extends SimpleChannelInboundHandler { } // 处理数据 - byte[] response = ykcService.process(msg, channel); + byte[] response = ykcService.process(msg, ctx); if (Objects.nonNull(response)) { // 响应客户端 ByteBuf buffer = ctx.alloc().buffer().writeBytes(response); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCBusinessService.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCBusinessService.java index f3d8102dd..102ac12fc 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCBusinessService.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/YKCBusinessService.java @@ -1,6 +1,7 @@ package com.jsowell.netty.service.yunkuaichong; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelId; /** @@ -12,10 +13,10 @@ public interface YKCBusinessService { * 处理桩发来的请求 * 不需要应答的返回null * @param msg 请求报文 - * @param channel 通道信息 + * @param ctx 通道信息 * @return 结果 */ - byte[] process(byte[] msg, Channel channel); + byte[] process(byte[] msg, ChannelHandlerContext ctx); /** * 桩退出 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 f20aa0c10..327c78c71 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 @@ -14,6 +14,7 @@ import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelId; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { private YKCPushCommandService ykcPushCommandService; @Override - public byte[] process(byte[] msg, Channel channel) { + public byte[] process(byte[] msg, ChannelHandlerContext ctx) { if (!YKCUtils.checkMsg(msg)) { // 校验不通过，丢弃消息 return null; @@ -46,7 +47,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { String frameType = YKCUtils.frameType2Str(ykcDataProtocol.getFrameType()); // 获取业务处理handler AbstractHandler invokeStrategy = YKCOperateFactory.getInvokeStrategy(frameType); - return invokeStrategy.supplyProcess(ykcDataProtocol, channel); + return invokeStrategy.supplyProcess(ykcDataProtocol, ctx); } @Override From 1cec3f64c5038ed3fba4cdf3eb016cd7534e29c5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 1 Aug 2024 11:35:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8ChannelHandlerContext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/netty/handler/yunkuaichong/AbstractHandler.java | 4 ++-- .../netty/handler/yunkuaichong/LoginRequestHandler.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java index ea23ba298..e93152970 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java @@ -97,11 +97,11 @@ public abstract class AbstractHandler implements InitializingBean { * 阻止重复帧 * @return true 重复 */ - protected boolean verifyTheDuplicateRequest(YKCDataProtocol ykcDataProtocol, Channel channel) { + protected boolean verifyTheDuplicateRequest(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { // 获取序列号域 int serialNumber = BytesUtil.bytesToIntLittle(ykcDataProtocol.getSerialNumber()); // 获取channelId - String channelId = channel.id().asShortText(); + String channelId = ctx.channel().id().asShortText(); String redisKey = "Request_" + channelId + "_" + serialNumber; Boolean result = redisCache.setnx(redisKey, ykcDataProtocol.getHEXString(), 30); // result返回false说明没有设置成功，就是说已经有相同请求了，所以返回true重复 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java index dcb169025..99f59fdbb 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java @@ -106,7 +106,7 @@ public class LoginRequestHandler extends AbstractHandler { } @Override - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { // 获取消息体 byte[] msgBody = ykcDataProtocol.getMsgBody(); @@ -118,7 +118,7 @@ public class LoginRequestHandler extends AbstractHandler { String pileSn = BytesUtil.binary(pileSnByte, 16); // 保存时间 - saveLastTimeAndCheckChannel(pileSn, channel); + saveLastTimeAndCheckChannel(pileSn, ctx); // 桩类型 0 表示直流桩， 1 表示交流桩 startIndex += length; @@ -164,7 +164,7 @@ public class LoginRequestHandler extends AbstractHandler { String business = BytesUtil.bcd2Str(businessTypeByteArr); // *********************** 字段解析完成，下面进行逻辑处理 *********************** // - if (verifyTheDuplicateRequest(ykcDataProtocol, channel)) { + if (verifyTheDuplicateRequest(ykcDataProtocol, ctx)) { return null; } From 3ac1d5752c78c5e2dc8eaa8e3859f9dfb0001319 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 1 Aug 2024 11:43:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8ChannelHandlerContext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/ykc/PileChannelEntity.java | 29 ++++++++++--------- .../electricbicycles/AbstractHandler.java | 9 +++--- .../handler/yunkuaichong/AbstractHandler.java | 10 +------ .../impl/YKCBusinessServiceImpl2.java | 2 +- .../impl/YKCBusinessServiceImpl.java | 2 +- .../impl/YKCPushCommandServiceImpl.java | 13 +++++---- 6 files changed, 30 insertions(+), 35 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 22cd31e49..3010be375 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 @@ -2,6 +2,7 @@ package com.jsowell.common.enums.ykc; import com.jsowell.common.util.StringUtils; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import java.util.HashMap; @@ -16,35 +17,35 @@ public class PileChannelEntity { /** * 管理一个全局map，保存连接进服务端的通道数量 */ - private static final ConcurrentHashMap manager = new ConcurrentHashMap<>(); + private static final ConcurrentHashMap manager = new ConcurrentHashMap<>(); /** * 校验channel是否保存 */ - public static void checkChannel(String pileSn, Channel channel) { + public static void checkChannel(String pileSn, ChannelHandlerContext ctx) { if (!manager.containsKey(pileSn)) { // 如果manager中不存在pileSn的连接，则保存 - log.info("checkChannel-manager中不存在pileSn:{}的连接,保存新的channel:{}", pileSn, channel.id().asLongText()); - manager.put(pileSn, channel); + log.info("checkChannel-manager中不存在pileSn:{}的连接,保存新的channel:{}", pileSn, ctx.channel().id().asLongText()); + manager.put(pileSn, ctx); return; } // 如果manager中存在pileSn的连接，取出来对比 - Channel sourceChannel = manager.get(pileSn); + Channel sourceChannel = manager.get(pileSn).channel(); if (sourceChannel == null) { // 为空就put - log.info("checkChannel-manager中pileSn:{}的连接为空,保存新的channel:{}", pileSn, channel.id().asLongText()); - manager.put(pileSn, channel); + log.info("checkChannel-manager中pileSn:{}的连接为空,保存新的channel:{}", pileSn, ctx.channel().id().asLongText()); + manager.put(pileSn, ctx); return; } // 两个做对比 String sourceChannelId = sourceChannel.id().asLongText(); - String channelId = channel.id().asLongText(); + String channelId = ctx.channel().id().asLongText(); if (!StringUtils.equals(sourceChannelId, channelId)) { // 不一致则更新 log.info("checkChannel-manager中pileSn:{}的连接不一致, 老channelId:{}, 保存新的channel:{}", pileSn, sourceChannelId, channelId); - manager.put(pileSn, channel); + manager.put(pileSn, ctx); } } @@ -53,7 +54,7 @@ public class PileChannelEntity { * @param pileSn * @return */ - public static Channel getChannelByPileSn(String pileSn) { + public static ChannelHandlerContext getChannelByPileSn(String pileSn) { return manager.get(pileSn); } @@ -63,8 +64,8 @@ public class PileChannelEntity { * @return */ public static String getPileSnByChannelId(String channelId) { - for (HashMap.Entry entry : manager.entrySet()) { - if (entry.getValue().id().asLongText().equals(channelId)) { + for (HashMap.Entry entry : manager.entrySet()) { + if (entry.getValue().channel().id().asLongText().equals(channelId)) { return entry.getKey(); } } @@ -75,9 +76,9 @@ public class PileChannelEntity { * 打印 */ public static void output() { - for (HashMap.Entry entry : manager.entrySet()) { + for (HashMap.Entry entry : manager.entrySet()) { System.out.println("pileSn:" + entry.getKey() + - ",ChannelId:" + entry.getValue().id().asLongText()); + ",ChannelId:" + entry.getValue().channel().id().asLongText()); } } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java index 3f98d5e8b..ab7a3bb16 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java @@ -10,6 +10,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.CRC16Util; import com.jsowell.common.util.DateUtils; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; @@ -66,23 +67,23 @@ public abstract class AbstractHandler implements InitializingBean { * 保存桩最后链接到平台的时间 * @param pileSn 桩编号 */ - protected void saveLastTimeAndCheckChannel(String pileSn, Channel channel) { + protected void saveLastTimeAndCheckChannel(String pileSn, ChannelHandlerContext ctx) { String redisKey = CacheConstants.PILE_LAST_CONNECTION + pileSn; redisCache.setCacheObject(redisKey, DateUtils.getDateTime(), CacheConstants.cache_expire_time_1d); // 保存桩号和channel的关系 - PileChannelEntity.checkChannel(pileSn, channel); + PileChannelEntity.checkChannel(pileSn, ctx); } /** * 阻止重复帧 * @return true 重复 */ - protected boolean verifyTheDuplicateRequest(YKCDataProtocol ykcDataProtocol, Channel channel) { + protected boolean verifyTheDuplicateRequest(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { // 获取序列号域 int serialNumber = BytesUtil.bytesToIntLittle(ykcDataProtocol.getSerialNumber()); // 获取channelId - String channelId = channel.id().asShortText(); + String channelId = ctx.channel().id().asShortText(); String redisKey = "Request_" + channelId + "_" + serialNumber; Boolean result = redisCache.setnx(redisKey, ykcDataProtocol.getHEXString(), 30); // result返回false说明没有设置成功，就是说已经有相同请求了，所以返回true重复 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java index e93152970..f0ff96e2c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java @@ -77,20 +77,12 @@ public abstract class AbstractHandler implements InitializingBean { * 保存桩最后链接到平台的时间 * @param pileSn 桩编号 */ - protected void saveLastTimeAndCheckChannel(String pileSn, Channel channel) { - String redisKey = CacheConstants.PILE_LAST_CONNECTION + pileSn; - redisCache.setCacheObject(redisKey, DateUtils.getDateTime(), CacheConstants.cache_expire_time_1d); - - // 保存桩号和channel的关系 - PileChannelEntity.checkChannel(pileSn, channel); - } - protected void saveLastTimeAndCheckChannel(String pileSn, ChannelHandlerContext ctx) { String redisKey = CacheConstants.PILE_LAST_CONNECTION + pileSn; redisCache.setCacheObject(redisKey, DateUtils.getDateTime(), CacheConstants.cache_expire_time_1d); // 保存桩号和channel的关系 - PileChannelEntity.checkChannel(pileSn, ctx.channel()); + PileChannelEntity.checkChannel(pileSn, ctx); } /** diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java index 8317640c7..4bb81e42a 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java @@ -56,7 +56,7 @@ public class YKCBusinessServiceImpl2 implements YKCBusinessService { if (StringUtils.isBlank(pileSn)) { return; } - log.info("充电桩退出:{}, channelId:{}", pileSn, PileChannelEntity.getChannelByPileSn(pileSn).id()); + log.info("充电桩退出:{}, channelId:{}", pileSn, PileChannelEntity.getChannelByPileSn(pileSn).channel().id()); // 充电桩断开连接，所有枪口都设置为【离线】 pileConnectorInfoService.updateConnectorStatusByPileSn(pileSn, PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue()); 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 327c78c71..a09ef4559 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 @@ -57,7 +57,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { if (StringUtils.isBlank(pileSn)) { return; } - log.info("充电桩退出:{}, channelId:{}", pileSn, PileChannelEntity.getChannelByPileSn(pileSn).id()); + log.info("充电桩退出:{}, channelId:{}", pileSn, PileChannelEntity.getChannelByPileSn(pileSn).channel().id()); // 充电桩断开连接，所有枪口都设置为【离线】 pileConnectorInfoService.updateConnectorStatusByPileSn(pileSn, PileConnectorDataBaseStatusEnum.OFF_NETWORK.getValue()); 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 cd5508d40..01100616c 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 @@ -18,6 +18,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -71,9 +72,9 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { */ public boolean push(byte[] msg, String pileSn, Enum frameTypeCode) { // 通过桩编号获取channel - Channel channel = PileChannelEntity.getChannelByPileSn(pileSn); + ChannelHandlerContext ctx = PileChannelEntity.getChannelByPileSn(pileSn); String value = ((YKCFrameTypeCode) frameTypeCode).getValue(); - if (Objects.isNull(channel)) { + if (Objects.isNull(ctx)) { log.error("push命令[{}]失败, 桩号:{}无法获取到长连接, 请检查充电桩连接状态!", value, pileSn); return false; } @@ -106,18 +107,18 @@ public class YKCPushCommandServiceImpl implements YKCPushCommandService { // 返回完整的报文 string类型 String wholeMsg = BytesUtil.binary(writeMsg, 16); - ByteBuf byteBuf = channel.alloc().buffer().writeBytes(writeMsg); - ChannelFuture channelFuture = channel.writeAndFlush(byteBuf); + ByteBuf byteBuf = ctx.channel().alloc().buffer().writeBytes(writeMsg); + ChannelFuture channelFuture = ctx.channel().writeAndFlush(byteBuf); channelFuture.addListener((ChannelFutureListener) channelFutureListener -> { // 检查操作的状态 if (channelFutureListener.isSuccess()) { log.info("【push结果===>成功】, pileSn:{}, remoteAddress:{}, channelId:{}, 帧类型:{}, 报文:{}", - pileSn, channel.remoteAddress(), channel.id(), value, wholeMsg); + pileSn, ctx.channel().remoteAddress(), ctx.channel().id(), value, wholeMsg); } else { // 如果发生错误，则访问描述原因的Throwable Throwable cause = channelFutureListener.cause(); log.info("【push结果===>失败】, pileSn:{}, remoteAddress:{}, channelId:{}, 帧类型:{}, 报文:{}", - pileSn, channel.remoteAddress(), channel.id(), value, wholeMsg); + pileSn, ctx.channel().remoteAddress(), ctx.channel().id(), value, wholeMsg); log.error("push发送命令失败, pileSn:{}", pileSn, cause); } }); From 0ad35c93003c7f5c2026ac798dbf44bc0dc0ebd9 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 1 Aug 2024 11:51:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BD=BF=E7=94=A8ChannelHandlerContext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../netty/handler/electricbicycles/AbstractHandler.java | 2 +- .../netty/service/electricbicycles/YKCBusinessService.java | 5 +++-- .../electricbicycles/impl/YKCBusinessServiceImpl2.java | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java index ab7a3bb16..c59a53c16 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java @@ -26,7 +26,7 @@ public abstract class AbstractHandler implements InitializingBean { * 执行逻辑 * 有应答 */ - public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) { + public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, ChannelHandlerContext ctx) { throw new UnsupportedOperationException(); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/YKCBusinessService.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/YKCBusinessService.java index 9889312e5..4595dcb5f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/YKCBusinessService.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/YKCBusinessService.java @@ -1,6 +1,7 @@ package com.jsowell.netty.service.electricbicycles; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelId; /** @@ -12,10 +13,10 @@ public interface YKCBusinessService { * 处理桩发来的请求 * 不需要应答的返回null * @param msg 请求报文 - * @param channel 通道信息 + * @param ctx 通道信息 * @return 结果 */ - byte[] process(byte[] msg, Channel channel); + byte[] process(byte[] msg, ChannelHandlerContext ctx); /** * 桩退出 diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java index 4bb81e42a..9451d1361 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java @@ -14,6 +14,7 @@ import com.jsowell.pile.service.PileConnectorInfoService; import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelId; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +37,7 @@ public class YKCBusinessServiceImpl2 implements YKCBusinessService { private YKCPushCommandService ykcPushCommandService; @Override - public byte[] process(byte[] msg, Channel channel) { + public byte[] process(byte[] msg, ChannelHandlerContext ctx) { if (!YKCUtils.checkMsg(msg)) { // 校验不通过，丢弃消息 return null; @@ -46,7 +47,7 @@ public class YKCBusinessServiceImpl2 implements YKCBusinessService { String frameType = YKCUtils.frameType2Str(ykcDataProtocol.getFrameType()); // 获取业务处理handler AbstractHandler invokeStrategy = YKCOperateFactory.getInvokeStrategy(frameType); - return invokeStrategy.supplyProcess(ykcDataProtocol, channel); + return invokeStrategy.supplyProcess(ykcDataProtocol, ctx); } @Override