diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index c277bb2a6..a7cdfca58 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -1529,7 +1529,7 @@ public class SpringBootTestController { String pileSn = BytesUtil.binary(pileSnByteArr, 16); // 保存时间 - // saveLastTime(pileSn); + // saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java index 1c447d8c5..c422bd9ee 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/AbstractHandler.java @@ -5,6 +5,7 @@ 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; @@ -65,9 +66,12 @@ public abstract class AbstractHandler implements InitializingBean { * 保存桩最后链接到平台的时间 * @param pileSn 桩编号 */ - protected void saveLastTime(String pileSn) { + protected void saveLastTime(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); } } \ No newline at end of file diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java index f4ff3ad4c..02e330340 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSAbortDuringChargingPhaseHandler.java @@ -46,7 +46,7 @@ public class BMSAbortDuringChargingPhaseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java index d8e722d5c..5a7506569 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSDemandAndChargerOutputHandler.java @@ -45,7 +45,7 @@ public class BMSDemandAndChargerOutputHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java index a15085221..5600dcf2f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BMSInformationHandler.java @@ -45,7 +45,7 @@ public class BMSInformationHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java index 21ba48cef..daf550ffa 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateRequestHandler.java @@ -45,7 +45,7 @@ public class BillingTemplateRequestHandler extends AbstractHandler{ // log.info("桩号：{}", pileSn); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 根据桩号查询计费模板 BillingTemplateVO billingTemplateVO = pileBillingTemplateService.selectBillingTemplateDetailByPileSn(pileSn); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java index b590ad306..7dbc87096 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateResponseHandler.java @@ -36,7 +36,7 @@ public class BillingTemplateResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 设置结果 0x00 失败 0x01 成功 byte[] settingResultByteArr = BytesUtil.copyBytes(msgBody, 7, 1); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java index a3eadedd4..f5640cdaa 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/BillingTemplateValidateRequestHandler.java @@ -51,7 +51,7 @@ public class BillingTemplateValidateRequestHandler extends AbstractHandler{ String pileSn = BytesUtil.binary(pileSnByte, 16); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 计费模型编码 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index 4d4cc826c..157862ff2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -76,7 +76,7 @@ public class ChargeEndHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java index 12b263f55..182429a6a 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargerAbortedDuringChargingPhaseHandler.java @@ -45,7 +45,7 @@ public class ChargerAbortedDuringChargingPhaseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java index 630b71e90..6f0576deb 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargingHandshakeHandler.java @@ -45,7 +45,7 @@ public class ChargingHandshakeHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index 1ed6bffd2..bd5aa56a2 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -71,7 +71,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ String pileSn = BytesUtil.binary(pileSnByteArr, 16); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java index 353b98c63..597aaa0f3 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ErrorMessageHandler.java @@ -46,7 +46,7 @@ public class ErrorMessageHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java index a68a25d91..39ec7bfab 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/HeartbeatRequestHandler.java @@ -4,7 +4,6 @@ import com.google.common.primitives.Bytes; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; -import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; @@ -45,10 +44,10 @@ public class HeartbeatRequestHandler extends AbstractHandler { String pileSn = BytesUtil.binary(pileSnByte, 16); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 校验channel - PileChannelEntity.checkChannel(pileSn, channel); + // PileChannelEntity.checkChannel(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java index f70afc24d..5273712a9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/LoginRequestHandler.java @@ -8,16 +8,15 @@ import com.jsowell.common.core.domain.ykc.LoginRequestData; 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.StringUtils; import com.jsowell.common.util.YKCUtils; +import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand; import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand; -import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.YKCPushCommandService; import com.jsowell.pile.vo.base.PileInfoVO; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -125,7 +124,7 @@ public class LoginRequestHandler extends AbstractHandler { // log.info("桩号：{}", pileSn); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 桩类型 0 表示直流桩， 1 表示交流桩 startIndex += length; @@ -196,7 +195,7 @@ public class LoginRequestHandler extends AbstractHandler { if (pileInfoVO != null) { flag = Constants.zeroByteArray; // 登录成功，保存桩号和channel的关系 - PileChannelEntity.checkChannel(pileSn, channel); + // PileChannelEntity.checkChannel(pileSn, channel); // 更改桩和该桩下的枪口状态分别为 在线、空闲 公共方法修改状态 pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, null, null, null); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java index 3dc257a0c..8e7266ff9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataCleaningResponseHandler.java @@ -39,7 +39,7 @@ public class OfflineCardDataCleaningResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 第 1 个卡物理卡号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java index e4c705abd..141e5dd35 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataQueryResponseHandler.java @@ -39,7 +39,7 @@ public class OfflineCardDataQueryResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 第1个卡物理卡号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java index 113c01491..fad73bfb0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/OfflineCardDataSynchronizationResponseHandler.java @@ -39,7 +39,7 @@ public class OfflineCardDataSynchronizationResponseHandler extends AbstractHandl String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 保存结果 0x00 失败 0x01 成功 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java index d1fe81c1d..36fc0ab20 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java @@ -54,7 +54,7 @@ public class ParameterConfigurationHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java index 3e727d140..330194e12 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingResponseHandler.java @@ -39,7 +39,7 @@ public class PileWorkingParameterSettingResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 设置结果 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java index 2b6c19526..553d11afa 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/QueryPileWorkParamsHandler.java @@ -39,7 +39,7 @@ public class QueryPileWorkParamsHandler extends AbstractHandler{ String pileSn = BytesUtil.binary(pileSnByte, 16); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 充电桩类型 0x00:直流0x01:交流 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java index a1b308817..90168f26c 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteAccountBalanceUpdateRequestHandler.java @@ -39,7 +39,7 @@ public class RemoteAccountBalanceUpdateRequestHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java index 8cdb2920d..1a33aeb92 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteIssuedQrCodeResponseHandler.java @@ -39,7 +39,7 @@ public class RemoteIssuedQrCodeResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 下发结果 0x00：成功 0x01：失败 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java index 81fc03db9..a8938d4e3 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteRestartResponseHandler.java @@ -45,7 +45,7 @@ public class RemoteRestartResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 保存报文 String jsonMsg = JSONObject.toJSONString(ykcDataProtocol); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java index 5de467ca0..451324495 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java @@ -53,7 +53,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java index 32e377ae9..2aaa32f65 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java @@ -50,7 +50,7 @@ public class RemoteStopChargingRequestHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 枪号 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java index 1846fd2cc..294ba444d 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteUpdateResponseHandler.java @@ -39,7 +39,7 @@ public class RemoteUpdateResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 升级状态 0x00-成功 0x01-编号错误 0x02-程序与桩型号不符 0x03-下载更新文件超时 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java index 6d8600ee1..df8dfc9d8 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/SettingPileWorkParamsHandler.java @@ -39,7 +39,7 @@ public class SettingPileWorkParamsHandler extends AbstractHandler{ String pileSn = BytesUtil.binary(pileSnByte, 16); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 设置状态 0x00-成功 0x01-失败 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java index 1587e8653..3c03162a8 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TimeCheckSettingResponseHandler.java @@ -40,7 +40,7 @@ public class TimeCheckSettingResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 当前时间 startIndex += length; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index 7c254eec4..c5d35ac86 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -9,7 +9,6 @@ import com.jsowell.common.core.domain.ykc.YKCFrameTypeCode; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; -import com.jsowell.common.enums.ykc.PileChannelEntity; import com.jsowell.common.enums.ykc.StartModeEnum; import com.jsowell.common.enums.ykc.YKCPileFaultReasonEnum; import com.jsowell.common.util.BytesUtil; @@ -107,10 +106,10 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { realTimeMonitorData.setPileSn(pileSn); // 保存时间 - saveLastTime(pileSn); + saveLastTime(pileSn, channel); // 校验channel - PileChannelEntity.checkChannel(pileSn, channel); + // PileChannelEntity.checkChannel(pileSn, channel); // 枪号 startIndex += length;