diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java index 879a234..f2fa5af 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java @@ -263,7 +263,7 @@ public class DefaultPileProtocolService implements PileProtocolService { String tradeNo = transactionRecordRequest.getTradeNo(); String pileCode = transactionRecordRequest.getPileCode(); - // 构造下行计费 + // 构造下行应答 DownlinkRequestMessage.Builder downlinkMessageBuilder = createDownlinkMessageBuilder(uplinkQueueMessage, pileCode); downlinkMessageBuilder.setDownlinkCmd(DownlinkCmdEnum.TRANSACTION_RECORD_ACK.name()); diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java index 399882b..58b074c 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340LoginAckDLCmd.java @@ -96,7 +96,7 @@ public class LvnengV340LoginAckDLCmd extends LvnengDownlinkCmdExe { private void registerSyncTimeTask(TcpSession tcpSession, byte[] pileCodeBytes, LvnengUplinkMessage requestData) { tcpSession.addSchedule(SCHEDULE_KEY_AUTO_SYNC_TIME, k -> { - log.info("{} 云快充3.4开始注册定时对时任务", tcpSession); + log.info("{} 绿能3.4开始注册定时对时任务", tcpSession); return PROTOCOL_SESSION_SCHEDULED.scheduleAtFixedRate(() -> syncTime(tcpSession, pileCodeBytes, requestData), 0, RandomUtil.randomInt(420, 480), TimeUnit.MINUTES); diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java index cd95365..fa184c6 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340RealTimeDataULCmd.java @@ -67,7 +67,7 @@ public class LvnengV340RealTimeDataULCmd extends LvnengUplinkCmdExe { additionalInfo.put("充电枪数量", gunsNum); //5 充电枪口 - byte gunCode = byteBuf.readByte(); + int gunCode = byteBuf.readByte(); additionalInfo.put("充电枪口", gunCode); //6 充电枪类型 @@ -272,7 +272,7 @@ public class LvnengV340RealTimeDataULCmd extends LvnengUplinkCmdExe { realTimeDataAck(tcpSession, gunCode); } - private void realTimeDataAck(TcpSession tcpSession, byte gunCode) { + private void realTimeDataAck(TcpSession tcpSession, int gunCode) { ByteBuf pingAckMsgBody = Unpooled.buffer(5); pingAckMsgBody.writeShortLE(0); pingAckMsgBody.writeShortLE(0); diff --git a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java index 29fbdb4..e1d5c82 100644 --- a/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java +++ b/jcpp-protocol-lvneng/src/main/java/sanbing/jcpp/protocol/lvneng/v340/cmd/LvnengV340TransactionRecordULCmd.java @@ -69,7 +69,7 @@ public class LvnengV340TransactionRecordULCmd extends LvnengUplinkCmdExe { additionalInfo.put("充电枪位置类型", gunType); //5 充电枪口 - byte gunCode = byteBuf.readByte(); + int gunCode = byteBuf.readByte(); additionalInfo.put("充电枪口", gunCode); //6 卡号