From f6b3c993c8a56ba89b4e500b061b8e0bafcb2162 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 20 Aug 2024 15:43:30 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/ebike/EBikeCommandEnum.java | 41 +++++++++++++++++++ .../netty/factory/EBikeOperateFactory.java | 38 +++++++++++++++++ .../netty/factory/YKCOperateFactory.java | 8 ++-- ...Handler.java => AbstractEBikeHandler.java} | 3 +- .../GetServerTimeHandler.java | 20 +++++++++ .../electricbicycles/HeartbeatHandler.java | 20 +++++++++ .../electricbicycles/RegistrationHandler.java | 20 +++++++++ .../SettlementUploadHandler.java | 20 +++++++++ ...ctHandler.java => AbstractYkcHandler.java} | 2 +- .../BMSAbortDuringChargingPhaseHandler.java | 3 +- .../BMSDemandAndChargerOutputHandler.java | 3 +- .../yunkuaichong/BMSInformationHandler.java | 3 +- .../BillingTemplateRequestHandler.java | 3 +- .../BillingTemplateResponseHandler.java | 3 +- .../BillingTemplateSettingHandler.java | 3 +- ...BillingTemplateValidateRequestHandler.java | 3 +- .../yunkuaichong/ChargeEndHandler.java | 3 +- ...rgerAbortedDuringChargingPhaseHandler.java | 3 +- .../ChargingHandshakeHandler.java | 3 +- .../ConfirmStartChargingRequestHandler.java | 2 +- .../yunkuaichong/ErrorMessageHandler.java | 3 +- .../GroundLockDataUploadHandler.java | 3 +- .../yunkuaichong/HeartbeatRequestHandler.java | 3 +- .../yunkuaichong/LoginRequestHandler.java | 3 +- .../OfflineCardDataCleaningHandler.java | 3 +- ...fflineCardDataCleaningResponseHandler.java | 3 +- .../OfflineCardDataQueryHandler.java | 3 +- .../OfflineCardDataQueryResponseHandler.java | 3 +- ...OfflineCardDataSynchronizationHandler.java | 3 +- ...ardDataSynchronizationResponseHandler.java | 3 +- .../ParameterConfigurationHandler.java | 3 +- .../PileWorkingParameterSettingHandler.java | 3 +- ...orkingParameterSettingResponseHandler.java | 3 +- .../QueryPileWorkParamsHandler.java | 3 +- .../ReadRealTimeMonitorDataHandler.java | 5 +-- ...oteAccountBalanceUpdateRequestHandler.java | 3 +- .../RemoteControlGroundLockHandler.java | 3 +- ...emoteControlGroundLockResponseHandler.java | 3 +- .../RemoteIssuedQrCodeHandler.java | 2 +- .../RemoteIssuedQrCodeResponseHandler.java | 3 +- .../yunkuaichong/RemoteRestartHandler.java | 3 +- .../RemoteRestartResponseHandler.java | 3 +- .../RemoteStartChargingRequestHandler.java | 3 +- .../RemoteStopChargingRequestHandler.java | 3 +- .../yunkuaichong/RemoteUpdateHandler.java | 3 +- .../RemoteUpdateResponseHandler.java | 3 +- .../ReservationChargingHandler.java | 2 +- .../ReservationChargingResponseHandler.java | 3 +- ...servationChargingStartupResultHandler.java | 3 +- .../SettingPileWorkParamsHandler.java | 3 +- .../yunkuaichong/TimeCheckSettingHandler.java | 3 +- .../TimeCheckSettingResponseHandler.java | 3 +- .../TransactionRecordsRequestHandler.java | 2 +- .../UploadRealTimeMonitorHandler.java | 2 +- .../impl/YKCBusinessServiceImpl2.java | 5 +-- .../impl/YKCBusinessServiceImpl.java | 5 +-- .../pile/service/EBikeSendCommandService.java | 2 +- .../impl/EBikeSendCommandServiceImpl.java | 13 ++++++ 58 files changed, 228 insertions(+), 101 deletions(-) create mode 100644 jsowell-common/src/main/java/com/jsowell/common/core/domain/ebike/EBikeCommandEnum.java create mode 100644 jsowell-netty/src/main/java/com/jsowell/netty/factory/EBikeOperateFactory.java rename jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/{AbstractHandler.java => AbstractEBikeHandler.java} (97%) create mode 100644 jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/GetServerTimeHandler.java create mode 100644 jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/HeartbeatHandler.java create mode 100644 jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/RegistrationHandler.java create mode 100644 jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java rename jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/{AbstractHandler.java => AbstractYkcHandler.java} (98%) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandServiceImpl.java diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ebike/EBikeCommandEnum.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ebike/EBikeCommandEnum.java new file mode 100644 index 000000000..ac883bc28 --- /dev/null +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ebike/EBikeCommandEnum.java @@ -0,0 +1,41 @@ +package com.jsowell.common.core.domain.ebike; + +import lombok.extern.slf4j.Slf4j; + +/** + * 友电电单车协议指令 + */ +@Slf4j +public enum EBikeCommandEnum { + // HEARTBEAT("01", "设备心跳包"), + REGISTRATION("20", "设备注册包"), + GET_SERVER_TIME("22", "设备获取服务器时间"), + HEARTBEAT_2("21", "设备心跳包"), + CARD_OPERATION("02", "刷卡操作"), + SETTLEMENT_UPLOAD("03", "结算消费信息上传"), + CHARGE_PORT_CONFIRMATION("04", "充电端口订单确认"), + POWER_HEARTBEAT("06", "端口充电时功率心跳包"), + CHARGER_HEARTBEAT("41", "充电柜专有心跳包"), + ALARM_PUSH("42", "报警推送指令"), + CHARGE_COMPLETE("43", "充电完成通知，但不结算"), + PORT_PUSH("44", "端口推送指令"); + + ; + + EBikeCommandEnum(String code, String desc) { + this.code = code; + this.desc = desc; + } + + private final String code; // 帧类型code + private final String desc; // 帧类型名称 + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } + +} \ No newline at end of file diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/factory/EBikeOperateFactory.java b/jsowell-netty/src/main/java/com/jsowell/netty/factory/EBikeOperateFactory.java new file mode 100644 index 000000000..5985c11c0 --- /dev/null +++ b/jsowell-netty/src/main/java/com/jsowell/netty/factory/EBikeOperateFactory.java @@ -0,0 +1,38 @@ +package com.jsowell.netty.factory; + +import com.google.common.collect.Maps; +import com.jsowell.common.util.StringUtils; +import com.jsowell.netty.handler.electricbicycles.AbstractEBikeHandler; + +import java.util.Map; +import java.util.Objects; + +/** + * 工厂设计模式 + * 云快充操作 + */ +public class EBikeOperateFactory { + + private static Map strategyMap = Maps.newHashMap(); + + /** + * 注册 + * @param str + * @param handler + */ + public static void register(String str, AbstractEBikeHandler handler) { + if (StringUtils.isBlank(str) || Objects.isNull(handler)) { + return; + } + strategyMap.put(str, handler); + } + + /** + * 获取 + * @param name + * @return + */ + public static AbstractEBikeHandler getInvokeStrategy(String name) { + return strategyMap.get(name); + } +} diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java b/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java index f45f3e2d5..8ea2118bf 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/factory/YKCOperateFactory.java @@ -2,7 +2,7 @@ package com.jsowell.netty.factory; import com.google.common.collect.Maps; import com.jsowell.common.util.StringUtils; -import com.jsowell.netty.handler.yunkuaichong.AbstractHandler; +import com.jsowell.netty.handler.yunkuaichong.AbstractYkcHandler; import java.util.Map; import java.util.Objects; @@ -13,14 +13,14 @@ import java.util.Objects; */ public class YKCOperateFactory { - private static Map strategyMap = Maps.newHashMap(); + private static Map strategyMap = Maps.newHashMap(); /** * 注册 * @param str * @param handler */ - public static void register(String str, AbstractHandler handler) { + public static void register(String str, AbstractYkcHandler handler) { if (StringUtils.isBlank(str) || Objects.isNull(handler)) { return; } @@ -32,7 +32,7 @@ public class YKCOperateFactory { * @param name * @return */ - public static AbstractHandler getInvokeStrategy(String name) { + public static AbstractYkcHandler getInvokeStrategy(String name) { return strategyMap.get(name); } } 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/AbstractEBikeHandler.java similarity index 97% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/AbstractEBikeHandler.java index c59a53c16..764c2467c 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/AbstractEBikeHandler.java @@ -9,7 +9,6 @@ import com.jsowell.common.enums.ykc.PileChannelEntity; 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; @@ -17,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * 模板方法模式 */ -public abstract class AbstractHandler implements InitializingBean { +public abstract class AbstractEBikeHandler implements InitializingBean { @Autowired private RedisCache redisCache; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/GetServerTimeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/GetServerTimeHandler.java new file mode 100644 index 000000000..ad27ed5a7 --- /dev/null +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/GetServerTimeHandler.java @@ -0,0 +1,20 @@ +package com.jsowell.netty.handler.electricbicycles; + +import com.jsowell.common.core.domain.ebike.EBikeCommandEnum; +import com.jsowell.netty.factory.EBikeOperateFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 设备心跳包 + */ +@Slf4j +@Component +public class GetServerTimeHandler extends AbstractEBikeHandler { + private final String type = EBikeCommandEnum.GET_SERVER_TIME.getCode(); + + @Override + public void afterPropertiesSet() throws Exception { + EBikeOperateFactory.register(type, this); + } +} diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/HeartbeatHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/HeartbeatHandler.java new file mode 100644 index 000000000..9a5dcb0d7 --- /dev/null +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/HeartbeatHandler.java @@ -0,0 +1,20 @@ +package com.jsowell.netty.handler.electricbicycles; + +import com.jsowell.common.core.domain.ebike.EBikeCommandEnum; +import com.jsowell.netty.factory.EBikeOperateFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 设备心跳包 + */ +@Slf4j +@Component +public class HeartbeatHandler extends AbstractEBikeHandler { + private final String type = EBikeCommandEnum.HEARTBEAT_2.getCode(); + + @Override + public void afterPropertiesSet() throws Exception { + EBikeOperateFactory.register(type, this); + } +} diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/RegistrationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/RegistrationHandler.java new file mode 100644 index 000000000..b4512e9e4 --- /dev/null +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/RegistrationHandler.java @@ -0,0 +1,20 @@ +package com.jsowell.netty.handler.electricbicycles; + +import com.jsowell.common.core.domain.ebike.EBikeCommandEnum; +import com.jsowell.netty.factory.EBikeOperateFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 设备心跳包 + */ +@Slf4j +@Component +public class RegistrationHandler extends AbstractEBikeHandler { + private final String type = EBikeCommandEnum.REGISTRATION.getCode(); + + @Override + public void afterPropertiesSet() throws Exception { + EBikeOperateFactory.register(type, this); + } +} diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java new file mode 100644 index 000000000..cbdd31de7 --- /dev/null +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/electricbicycles/SettlementUploadHandler.java @@ -0,0 +1,20 @@ +package com.jsowell.netty.handler.electricbicycles; + +import com.jsowell.common.core.domain.ebike.EBikeCommandEnum; +import com.jsowell.netty.factory.EBikeOperateFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * 设备心跳包 + */ +@Slf4j +@Component +public class SettlementUploadHandler extends AbstractEBikeHandler { + private final String type = EBikeCommandEnum.SETTLEMENT_UPLOAD.getCode(); + + @Override + public void afterPropertiesSet() throws Exception { + EBikeOperateFactory.register(type, this); + } +} 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/AbstractYkcHandler.java similarity index 98% rename from jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java rename to jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractYkcHandler.java index eebbb42d1..0e09df344 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/AbstractYkcHandler.java @@ -16,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; /** * 模板方法模式 */ -public abstract class AbstractHandler implements InitializingBean { +public abstract class AbstractYkcHandler implements InitializingBean { @Autowired private RedisCache redisCache; 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 8d23d2a67..cba855097 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BMSAbortDuringChargingPhaseHandler extends AbstractHandler{ +public class BMSAbortDuringChargingPhaseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BMS_ABORT_DURING_CHARGING_PHASE_CODE.getBytes()); @Override 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 829905c9b..d9dd0265d 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BMSDemandAndChargerOutputHandler extends AbstractHandler{ +public class BMSDemandAndChargerOutputHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGING_PROCESS_BMS_DEMAND_AND_CHARGER_OUTPUT_CODE.getBytes()); @Override 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 a3dcdb527..44e0bb607 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BMSInformationHandler extends AbstractHandler{ +public class BMSInformationHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGING_PROCESS_BMS_INFORMATION_CODE.getBytes()); @Override 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 79484a303..f36d3b9db 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 @@ -8,7 +8,6 @@ import com.jsowell.netty.factory.YKCOperateFactory; 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; @@ -22,7 +21,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BillingTemplateRequestHandler extends AbstractHandler{ +public class BillingTemplateRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BILLING_TEMPLATE_CODE.getBytes()); 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 347ac0617..59698d7db 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BillingTemplateResponseHandler extends AbstractHandler{ +public class BillingTemplateResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BILLING_TEMPLATE_SETTING_ANSWER_CODE.getBytes()); @Override 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 c303f4b08..af8a790dd 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BillingTemplateSettingHandler extends AbstractHandler{ +public class BillingTemplateSettingHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BILLING_TEMPLATE_SETTING_CODE.getBytes()); @Override 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 8f07ca078..a0a0684ef 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 @@ -9,7 +9,6 @@ import com.jsowell.common.util.YKCUtils; 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; @@ -23,7 +22,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class BillingTemplateValidateRequestHandler extends AbstractHandler{ +public class BillingTemplateValidateRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.BILLING_TEMPLATE_VALIDATE_CODE.getBytes()); 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 d04a751f6..3e61c2e69 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 @@ -8,7 +8,6 @@ import com.jsowell.common.util.YKCUtils; 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; @@ -26,7 +25,7 @@ import java.util.Objects; */ @Slf4j @Component -public class ChargeEndHandler extends AbstractHandler{ +public class ChargeEndHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGE_END_CODE.getBytes()); @Autowired 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 23186c12a..aac48924c 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ChargerAbortedDuringChargingPhaseHandler extends AbstractHandler{ +public class ChargerAbortedDuringChargingPhaseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.THE_CHARGER_IS_ABORTED_DURING_THE_CHARGING_PHASE_CODE.getBytes()); @Override 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 56f4b57cd..28e518974 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ChargingHandshakeHandler extends AbstractHandler{ +public class ChargingHandshakeHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGING_HANDSHAKE_CODE.getBytes()); @Override 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 1febc6c1e..0d332fd25 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 @@ -37,7 +37,7 @@ import java.util.Map; */ @Slf4j @Component -public class ConfirmStartChargingRequestHandler extends AbstractHandler{ +public class ConfirmStartChargingRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REQUEST_START_CHARGING_CODE.getBytes()); @Autowired 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 472938ae0..949c31c5c 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ErrorMessageHandler extends AbstractHandler{ +public class ErrorMessageHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.ERROR_MESSAGE_CODE.getBytes()); @Override 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 c845e6a4b..b2cd02990 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 @@ -18,7 +18,6 @@ import com.jsowell.common.util.YKCUtils; 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; @@ -37,7 +36,7 @@ import java.util.Objects; */ @Slf4j @Component -public class GroundLockDataUploadHandler extends AbstractHandler{ +public class GroundLockDataUploadHandler extends AbstractYkcHandler { @Autowired private RedisCache redisCache; 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 8b10a743c..0a810843c 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 @@ -8,7 +8,6 @@ import com.jsowell.common.util.BytesUtil; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class HeartbeatRequestHandler extends AbstractHandler { +public class HeartbeatRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.HEART_BEAT_CODE.getBytes()); 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 99f59fdbb..2d47c10fd 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 @@ -17,7 +17,6 @@ import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; 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; @@ -29,7 +28,7 @@ import java.util.concurrent.CompletableFuture; @Slf4j @Component -public class LoginRequestHandler extends AbstractHandler { +public class LoginRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.LOGIN_CODE.getBytes()); @Autowired 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 67af8e05e..422c1f188 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class OfflineCardDataCleaningHandler extends AbstractHandler{ +public class OfflineCardDataCleaningHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.OFFLINE_CARD_DATA_CLEANING_CODE.getBytes()); @Override 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 33b05d3d7..3eeafa336 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class OfflineCardDataCleaningResponseHandler extends AbstractHandler{ +public class OfflineCardDataCleaningResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.OFFLINE_CARD_DATA_CLEANING_ANSWER_CODE.getBytes()); @Override 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 9240e6c56..3029e38e9 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -20,7 +19,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class OfflineCardDataQueryHandler extends AbstractHandler{ +public class OfflineCardDataQueryHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.OFFLINE_CARD_DATA_QUERY_CODE.getBytes()); @Override 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 bd3dc4602..a16594405 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class OfflineCardDataQueryResponseHandler extends AbstractHandler{ +public class OfflineCardDataQueryResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.OFFLINE_CARD_DATA_QUERY_ANSWER_CODE.getBytes()); @Override 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 d6bb1ee92..69452c3e1 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -20,7 +19,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class OfflineCardDataSynchronizationHandler extends AbstractHandler{ +public class OfflineCardDataSynchronizationHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.OFFLINE_CARD_DATA_SYNCHRONIZATION_CODE.getBytes()); @Override 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 f3ddbd774..d80c42e09 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class OfflineCardDataSynchronizationResponseHandler extends AbstractHandler{ +public class OfflineCardDataSynchronizationResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.OFFLINE_CARD_DATA_SYNCHRONIZATION_ANSWER_CODE.getBytes()); @Override 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 ca1512b6b..d63f93704 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 @@ -7,7 +7,6 @@ import com.jsowell.common.util.YKCUtils; 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; @@ -24,7 +23,7 @@ import java.util.Objects; */ @Slf4j @Component -public class ParameterConfigurationHandler extends AbstractHandler{ +public class ParameterConfigurationHandler extends AbstractYkcHandler { @Autowired private OrderBasicInfoService orderBasicInfoService; 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 7076826b7..8e9ea70d7 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -20,7 +19,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class PileWorkingParameterSettingHandler extends AbstractHandler{ +public class PileWorkingParameterSettingHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGING_PILE_WORKING_PARAMETER_SETTING_CODE.getBytes()); @Override 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 4ef45e0f9..4497197eb 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class PileWorkingParameterSettingResponseHandler extends AbstractHandler{ +public class PileWorkingParameterSettingResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGING_PILE_WORKING_PARAMETER_SETTING_ANSWER_CODE.getBytes()); @Override 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 4fe914e74..9ec08dc4f 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class QueryPileWorkParamsHandler extends AbstractHandler{ +public class QueryPileWorkParamsHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.QUERY_PILE_WORK_PARAMS_ANSWER_CODE.getBytes()); @Override 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 e5aa93a55..145ee64cf 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 @@ -7,11 +7,8 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.util.BytesUtil; 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; /** @@ -23,7 +20,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ReadRealTimeMonitorDataHandler extends AbstractHandler{ +public class ReadRealTimeMonitorDataHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.READ_REAL_TIME_MONITOR_DATA_CODE.getBytes()); 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 7cdceccf6..be3d06955 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteAccountBalanceUpdateRequestHandler extends AbstractHandler{ +public class RemoteAccountBalanceUpdateRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_ACCOUNT_BALANCE_UPDATE_CODE.getBytes()); @Override 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 55538c1d1..5fb8fe83c 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteControlGroundLockHandler extends AbstractHandler{ +public class RemoteControlGroundLockHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_GROUND_LOCK_CODE.getBytes()); @Override 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 7995913ac..33582480c 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 @@ -6,7 +6,6 @@ import com.jsowell.common.util.BytesUtil; 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; @@ -22,7 +21,7 @@ import java.util.Locale; */ @Slf4j @Component -public class RemoteControlGroundLockResponseHandler extends AbstractHandler{ +public class RemoteControlGroundLockResponseHandler extends AbstractYkcHandler { @Autowired private OrderPileOccupyService orderPileOccupyService; 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 7fca358a1..f5efc66c9 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 @@ -24,7 +24,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteIssuedQrCodeHandler extends AbstractHandler{ +public class RemoteIssuedQrCodeHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_ISSUE_QRCODE_CODE.getBytes()); @Override 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 46f5808ff..ea1b69602 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteIssuedQrCodeResponseHandler extends AbstractHandler{ +public class RemoteIssuedQrCodeResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_ISSUE_QRCODE_ANSWER_CODE.getBytes()); @Override 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 ef1e9a7e8..a701e9685 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -20,7 +19,7 @@ import org.springframework.stereotype.Component; @Slf4j @Component @Deprecated -public class RemoteRestartHandler extends AbstractHandler{ +public class RemoteRestartHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_RESTART_CODE.getBytes()); @Override 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 da7f89c56..667333bf1 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 @@ -7,7 +7,6 @@ import com.jsowell.common.util.BytesUtil; 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; @@ -21,7 +20,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteRestartResponseHandler extends AbstractHandler{ +public class RemoteRestartResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_RESTART_ANSWER_CODE.getBytes()); @Autowired 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 22fc90e75..c9889e177 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 @@ -11,7 +11,6 @@ import com.jsowell.netty.factory.YKCOperateFactory; 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; @@ -27,7 +26,7 @@ import java.util.concurrent.CompletableFuture; */ @Slf4j @Component -public class RemoteStartChargingRequestHandler extends AbstractHandler{ +public class RemoteStartChargingRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_START_CHARGING_ANSWER_CODE.getBytes()); @Autowired 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 74968ddbd..e4235fd68 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 @@ -10,7 +10,6 @@ import com.jsowell.common.util.YKCUtils; 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; @@ -26,7 +25,7 @@ import java.util.Date; */ @Slf4j @Component -public class RemoteStopChargingRequestHandler extends AbstractHandler{ +public class RemoteStopChargingRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_CONTROL_STOP_CHARGING_ANSWER_CODE.getBytes()); @Autowired 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 878e801f0..a6907796a 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -20,7 +19,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteUpdateHandler extends AbstractHandler{ +public class RemoteUpdateHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_UPDATE_CODE.getBytes()); @Override 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 5b35f04e4..c267b71e6 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class RemoteUpdateResponseHandler extends AbstractHandler{ +public class RemoteUpdateResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_UPDATE_ANSWER_CODE.getBytes()); @Override diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingHandler.java index 1967cd0a9..00e6ad6e7 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReservationChargingHandler.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ReservationChargingHandler extends AbstractHandler{ +public class ReservationChargingHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_SETUP_CODE.getBytes()); 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 60c5eb404..59d08d467 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -15,7 +14,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ReservationChargingResponseHandler extends AbstractHandler{ +public class ReservationChargingResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_SETUP_ANSWER_CODE.getBytes()); 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 b725b589c..c491825e9 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 @@ -12,7 +12,6 @@ import com.jsowell.common.util.YKCUtils; 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; @@ -23,7 +22,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class ReservationChargingStartupResultHandler extends AbstractHandler{ +public class ReservationChargingStartupResultHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.RESERVATION_CHARGING_STARTUP_RESULT_CODE.getBytes()); 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 c69ca20fd..a2a0ba884 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 @@ -5,7 +5,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; 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; @@ -18,7 +17,7 @@ import org.springframework.stereotype.Component; */ @Component @Slf4j -public class SettingPileWorkParamsHandler extends AbstractHandler{ +public class SettingPileWorkParamsHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.SETTING_PILE_WORK_PARAMS_ANSWER_CODE.getBytes()); @Override 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 271b46c2d..1e7751c4c 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 @@ -4,7 +4,6 @@ import com.jsowell.common.core.domain.ykc.YKCDataProtocol; 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; @@ -19,7 +18,7 @@ import org.springframework.stereotype.Component; */ @Slf4j @Component -public class TimeCheckSettingHandler extends AbstractHandler{ +public class TimeCheckSettingHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.TIME_CHECK_SETTING_CODE.getBytes()); @Override 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 564916b03..5d0f3e495 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 @@ -7,7 +7,6 @@ import com.jsowell.common.util.Cp56Time2a.Cp56Time2aUtil; 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; @@ -22,7 +21,7 @@ import java.util.Date; */ @Slf4j @Component -public class TimeCheckSettingResponseHandler extends AbstractHandler{ +public class TimeCheckSettingResponseHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.TIME_CHECK_SETTING_ANSWER_CODE.getBytes()); @Override 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 29cf3e3c3..3539dcfdd 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 @@ -42,7 +42,7 @@ import java.util.concurrent.CompletableFuture; */ @Slf4j @Component -public class TransactionRecordsRequestHandler extends AbstractHandler { +public class TransactionRecordsRequestHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.TRANSACTION_RECORDS_CODE.getBytes()); private final String oldVersionType = YKCUtils.frameType2Str(YKCFrameTypeCode.TRANSACTION_RECORDS_OLD_VERSION_CODE.getBytes()); 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 2e37cd0db..3a7cc5714 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 @@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit; */ @Slf4j @Component -public class UploadRealTimeMonitorHandler extends AbstractHandler { +public class UploadRealTimeMonitorHandler extends AbstractYkcHandler { private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.UPLOAD_REAL_TIME_MONITOR_DATA_CODE.getBytes()); private final String oldVersionType = YKCUtils.frameType2Str(YKCFrameTypeCode.UPLOAD_REAL_TIME_MONITOR_DATA_OLD_VERSION_CODE.getBytes()); 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 9451d1361..7be8231e6 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 @@ -7,13 +7,12 @@ import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.handler.yunkuaichong.AbstractHandler; +import com.jsowell.netty.handler.yunkuaichong.AbstractYkcHandler; import com.jsowell.netty.service.electricbicycles.YKCBusinessService; import com.jsowell.pile.service.OrderBasicInfoService; 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; @@ -46,7 +45,7 @@ public class YKCBusinessServiceImpl2 implements YKCBusinessService { // 获取帧类型 String frameType = YKCUtils.frameType2Str(ykcDataProtocol.getFrameType()); // 获取业务处理handler - AbstractHandler invokeStrategy = YKCOperateFactory.getInvokeStrategy(frameType); + AbstractYkcHandler invokeStrategy = YKCOperateFactory.getInvokeStrategy(frameType); return invokeStrategy.supplyProcess(ykcDataProtocol, 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 a09ef4559..cb27d30dc 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 @@ -7,13 +7,12 @@ import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.netty.handler.yunkuaichong.AbstractHandler; +import com.jsowell.netty.handler.yunkuaichong.AbstractYkcHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; import com.jsowell.pile.service.PileConnectorInfoService; 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; @@ -46,7 +45,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { // 获取帧类型 String frameType = YKCUtils.frameType2Str(ykcDataProtocol.getFrameType()); // 获取业务处理handler - AbstractHandler invokeStrategy = YKCOperateFactory.getInvokeStrategy(frameType); + AbstractYkcHandler invokeStrategy = YKCOperateFactory.getInvokeStrategy(frameType); return invokeStrategy.supplyProcess(ykcDataProtocol, ctx); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java index 4851b71b2..b1402bc90 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/EBikeSendCommandService.java @@ -6,5 +6,5 @@ import com.jsowell.pile.domain.ebike.AbsEBikeMessage; * 电单车发送命令服务 */ public interface EBikeSendCommandService { - void send(String pileSn, AbsEBikeMessage c); + void send(String pileSn, AbsEBikeMessage msg); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandServiceImpl.java new file mode 100644 index 000000000..1d0b6c4c2 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandServiceImpl.java @@ -0,0 +1,13 @@ +package com.jsowell.pile.service.impl; + +import com.jsowell.pile.domain.ebike.AbsEBikeMessage; +import com.jsowell.pile.service.EBikeSendCommandService; +import org.springframework.stereotype.Service; + +@Service +public class EBikeSendCommandServiceImpl implements EBikeSendCommandService { + @Override + public void send(String pileSn, AbsEBikeMessage msg) { + + } +}