update 修改结构

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.AbstractHandler;
+import com.jsowell.netty.handler.yunkuaichong.AbstractHandler;
 
 import java.util.Map;
 import java.util.Objects;

jsowell-netty/src/main/java/com/jsowell/netty/handler/diandanche/AbstractHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.diandanche;
 
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.CacheConstants;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/AbstractHandler.java

@@ -0,0 +1,92 @@
+package com.jsowell.netty.handler.yunkuaichong;
+
+import com.google.common.primitives.Bytes;
+import com.jsowell.common.constant.CacheConstants;
+import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
+import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
+import com.jsowell.common.core.redis.RedisCache;
+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 org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 模板方法模式
+ */
+public abstract class AbstractHandler implements InitializingBean {
+
+     @Autowired
+     private RedisCache redisCache;
+
+     /**
+      * 执行逻辑
+      * 有应答
+      */
+     public byte[] supplyProcess(YKCDataProtocol ykcDataProtocol, Channel channel) {
+          throw new UnsupportedOperationException();
+     }
+
+     /**
+      * 执行逻辑
+      * 不需要应答
+      */
+     // public void pushProcess() {
+     //      throw new UnsupportedOperationException();
+     // }
+
+     /**
+      * 组装应答的结果
+      * @param ykcDataProtocol 请求数据
+      * @param messageBody 消息体
+      * @return 应答结果
+      */
+     protected byte[] getResult(YKCDataProtocol ykcDataProtocol, byte[] messageBody) {
+          // 起始标志
+          byte[] head = ykcDataProtocol.getHead();
+          // 序列号域
+          byte[] serialNumber = ykcDataProtocol.getSerialNumber();
+          // 加密标志
+          byte[] encryptFlag = ykcDataProtocol.getEncryptFlag();
+          // 请求帧类型
+          byte[] requestFrameType = ykcDataProtocol.getFrameType();
+          // 应答帧类型
+          byte[] responseFrameType = YKCFrameTypeCode.ResponseRelation.getResponseFrameTypeBytes(requestFrameType);
+
+          // 数据域 值为“序列号域+加密标志+帧类型标志+消息体”字节数之和
+          byte[] dataFields = Bytes.concat(serialNumber, encryptFlag, responseFrameType, messageBody);
+          // 计算crc： 从序列号域到数据域的 CRC 校验
+          int crc16 = CRC16Util.calcCrc16(dataFields);
+          return Bytes.concat(head, BytesUtil.intToBytes(dataFields.length, 1), dataFields, BytesUtil.intToBytes(crc16));
+     }
+
+     /**
+      * 保存桩最后链接到平台的时间
+      * @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);
+     }
+
+     /**
+      * 阻止重复帧
+      * @return true 重复
+      */
+     protected boolean verifyTheDuplicateRequest(YKCDataProtocol ykcDataProtocol, Channel channel) {
+          // 获取序列号域
+          int serialNumber = BytesUtil.bytesToIntLittle(ykcDataProtocol.getSerialNumber());
+          // 获取channelId
+          String channelId = channel.id().asShortText();
+          String redisKey = "Request_" + channelId + "_" + serialNumber;
+          Boolean result = redisCache.setnx(redisKey, ykcDataProtocol.getHEXString(), 30);
+          // result返回false说明没有设置成功，就是说已经有相同请求了，所以返回true重复
+          return !result;
+     }
+
+}

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSAbortDuringChargingPhaseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSDemandAndChargerOutputHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BMSInformationHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateSettingHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/BillingTemplateValidateRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.Constants;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargeEndHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargerAbortedDuringChargingPhaseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ChargingHandshakeHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ConfirmStartChargingRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.alibaba.fastjson2.JSON;
 import com.google.common.primitives.Bytes;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ErrorMessageHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/GroundLockDataUploadHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.alibaba.fastjson2.JSON;
 import com.jsowell.common.constant.CacheConstants;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/HeartbeatRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.Constants;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/LoginRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Lists;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataCleaningResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataQueryResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/OfflineCardDataSynchronizationResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ParameterConfigurationHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/PileWorkingParameterSettingResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/QueryPileWorkParamsHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReadRealTimeMonitorDataHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.Constants;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteAccountBalanceUpdateRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteControlGroundLockResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.google.common.primitives.Bytes;
 import com.jsowell.common.constant.Constants;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteIssuedQrCodeResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteRestartResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.alibaba.fastjson2.JSON;
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStopChargingRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteUpdateResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
 import com.jsowell.common.util.YKCUtils;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/ReserveChargingResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;
 import com.jsowell.common.util.YKCUtils;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/SettingPileWorkParamsHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TimeCheckSettingResponseHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.core.domain.ykc.YKCDataProtocol;
 import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.alibaba.fastjson2.JSON;
 import com.google.common.primitives.Bytes;

jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/UploadRealTimeMonitorHandler.java

@@ -1,4 +1,4 @@
-package com.jsowell.netty.handler;
+package com.jsowell.netty.handler.yunkuaichong;
 
 import com.jsowell.common.constant.CacheConstants;
 import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
@@ -17,8 +17,6 @@ import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.service.PileBasicInfoService;
 import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.thirdparty.common.CommonService;
-import com.jsowell.thirdparty.common.NotificationDTO;
-import com.jsowell.thirdparty.common.NotificationService;
 import io.netty.channel.Channel;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java

@@ -7,7 +7,7 @@ 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.AbstractHandler;
+import com.jsowell.netty.handler.yunkuaichong.AbstractHandler;
 import com.jsowell.netty.service.yunkuaichong.YKCBusinessService;
 import com.jsowell.pile.service.PileConnectorInfoService;
 import com.jsowell.pile.service.PileMsgRecordService;