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 c422bd9ee..8622c9947 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 @@ -66,7 +66,7 @@ public abstract class AbstractHandler implements InitializingBean { * 保存桩最后链接到平台的时间 * @param pileSn 桩编号 */ - protected void saveLastTime(String pileSn, Channel channel) { + protected void saveLastTimeAndCheckChannel(String pileSn, Channel channel) { String redisKey = CacheConstants.PILE_LAST_CONNECTION + pileSn; redisCache.setCacheObject(redisKey, DateUtils.getDateTime(), CacheConstants.cache_expire_time_1d); 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 02e330340..a3165961b 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, channel); + saveLastTimeAndCheckChannel(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 5a7506569..e8db78507 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, channel); + saveLastTimeAndCheckChannel(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 5600dcf2f..cb2e04745 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, channel); + saveLastTimeAndCheckChannel(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 daf550ffa..3b7a83694 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, channel); + saveLastTimeAndCheckChannel(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 7dbc87096..436023fa8 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, channel); + saveLastTimeAndCheckChannel(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 f5640cdaa..9f572c10d 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, channel); + saveLastTimeAndCheckChannel(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 157862ff2..bf3be3e8a 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, channel); + saveLastTimeAndCheckChannel(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 182429a6a..6e2f55384 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, channel); + saveLastTimeAndCheckChannel(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 6f0576deb..ab6096858 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, channel); + saveLastTimeAndCheckChannel(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 a8787f5a1..f7d9ab5c9 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, channel); + saveLastTimeAndCheckChannel(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 597aaa0f3..07ecb9f8e 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, channel); + saveLastTimeAndCheckChannel(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 39ec7bfab..fa58b08e4 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 @@ -44,7 +44,7 @@ public class HeartbeatRequestHandler extends AbstractHandler { String pileSn = BytesUtil.binary(pileSnByte, 16); // 保存时间 - saveLastTime(pileSn, channel); + saveLastTimeAndCheckChannel(pileSn, channel); // 校验channel // PileChannelEntity.checkChannel(pileSn, channel); 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 29b40831f..a3d2c41eb 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 @@ -124,7 +124,7 @@ public class LoginRequestHandler extends AbstractHandler { // log.info("桩号：{}", pileSn); // 保存时间 - saveLastTime(pileSn, channel); + saveLastTimeAndCheckChannel(pileSn, channel); // 桩类型 0 表示直流桩， 1 表示交流桩 startIndex += length; @@ -194,10 +194,15 @@ public class LoginRequestHandler extends AbstractHandler { if (pileInfoVO != null) { flag = Constants.zeroByteArray; - // 登录成功，保存桩号和channel的关系 - // PileChannelEntity.checkChannel(pileSn, channel); - // 更改桩和该桩下的枪口状态分别为 在线、空闲 公共方法修改状态 - pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, null, null, null); + + CompletableFuture.runAsync(() -> { + try { + // 更改桩和该桩下的枪口状态分别为 在线、空闲 公共方法修改状态 + pileBasicInfoService.updateStatus(BytesUtil.bcd2Str(ykcDataProtocol.getFrameType()), pileSn, null, null, null); + } catch (Exception e) { + e.printStackTrace(); + } + }); CompletableFuture.runAsync(() -> { try { @@ -233,12 +238,17 @@ public class LoginRequestHandler extends AbstractHandler { } }); } - } - // 保存报文 TODO 没有登录认证通过还要不要保存报文？ - String jsonMsg = JSONObject.toJSONString(loginRequestData); - pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ykcDataProtocol.getHEXString()); + CompletableFuture.runAsync(() -> { + // 保存报文 没有登录认证通过还要不要保存报文？ + try { + String jsonMsg = JSONObject.toJSONString(loginRequestData); + pileMsgRecordService.save(pileSn, pileSn, type, jsonMsg, ykcDataProtocol.getHEXString()); + } catch (Exception e) { + log.error("保存报文失败pileSn:{}", pileSn, e); + } + }); // 消息体 byte[] messageBody = Bytes.concat(pileSnByte, flag); 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 8e7266ff9..ae9294927 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, channel); + saveLastTimeAndCheckChannel(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 141e5dd35..c9f62365e 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, channel); + saveLastTimeAndCheckChannel(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 fad73bfb0..9d15540ba 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, channel); + saveLastTimeAndCheckChannel(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 36fc0ab20..8d540268e 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, channel); + saveLastTimeAndCheckChannel(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 330194e12..5024c0567 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, channel); + saveLastTimeAndCheckChannel(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 553d11afa..4543554b4 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, channel); + saveLastTimeAndCheckChannel(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 90168f26c..2c59f6271 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, channel); + saveLastTimeAndCheckChannel(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 1a33aeb92..40fc4a737 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, channel); + saveLastTimeAndCheckChannel(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 a8938d4e3..c7b6b8d46 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, channel); + saveLastTimeAndCheckChannel(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 451324495..12a9ecd5f 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, channel); + saveLastTimeAndCheckChannel(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 2aaa32f65..a1649ca5b 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, channel); + saveLastTimeAndCheckChannel(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 294ba444d..03c23991c 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, channel); + saveLastTimeAndCheckChannel(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 df8dfc9d8..7a0237a77 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, channel); + saveLastTimeAndCheckChannel(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 71faf3182..8b13d1157 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 @@ -43,7 +43,7 @@ public class TimeCheckSettingResponseHandler extends AbstractHandler{ String pileSn = BytesUtil.bcd2Str(pileSnByteArr); // 保存时间 - saveLastTime(pileSn, channel); + saveLastTimeAndCheckChannel(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 adceb1b52..2ffd7b76a 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 @@ -1,7 +1,6 @@ package com.jsowell.netty.handler; import com.alibaba.fastjson2.JSON; -import com.google.common.collect.Lists; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.common.core.domain.ykc.YKCDataProtocol; @@ -33,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Date; -import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -106,7 +104,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { realTimeMonitorData.setPileSn(pileSn); // 保存时间 - saveLastTime(pileSn, channel); + saveLastTimeAndCheckChannel(pileSn, channel); // 校验channel // PileChannelEntity.checkChannel(pileSn, channel);