diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java index 6e0517d..00b5e2d 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java @@ -75,7 +75,6 @@ public interface PileProtocolService { */ void startCharge(String pileCode, String gunCode, BigDecimal limitYuan, String orderNo); - /** * 重启充电 */ @@ -106,11 +105,10 @@ public interface PileProtocolService { */ void onRestartPileResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback); - /** * 充电阶段BMS中止 */ - void onBmsAbort(UplinkQueueMessage uplinkQueueMessage, Callback callback); + void postBmsAbort(UplinkQueueMessage uplinkQueueMessage, Callback callback); /** * 远程更新 @@ -128,7 +126,7 @@ public interface PileProtocolService { * @param uplinkQueueMessage 上行消息 * @param callback 回调 */ - void onBmsHandshake(UplinkQueueMessage uplinkQueueMessage, Callback callback); + void postBmsHandshake(UplinkQueueMessage uplinkQueueMessage, Callback callback); /** * 处理地锁状态信息 @@ -136,6 +134,6 @@ public interface PileProtocolService { * @param uplinkQueueMessage 上行消息 * @param callback 回调 */ - void onLockStatus(UplinkQueueMessage uplinkQueueMessage, Callback callback); + void postLockStatus(UplinkQueueMessage uplinkQueueMessage, Callback callback); } \ No newline at end of file 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 cd1f3a6..1cddcd2 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 @@ -346,7 +346,7 @@ public class DefaultPileProtocolService implements PileProtocolService { log.info("充电桩与 BMS 充电错误上报 {}", uplinkQueueMessage); } - public void onBmsAbort(UplinkQueueMessage uplinkQueueMessage, Callback callback) { + public void postBmsAbort(UplinkQueueMessage uplinkQueueMessage, Callback callback) { log.info("接收到充电阶段BMS中止报文 {}", uplinkQueueMessage); // TODO 处理相关业务逻辑 callback.onSuccess(); @@ -412,7 +412,7 @@ public class DefaultPileProtocolService implements PileProtocolService { } @Override - public void onBmsHandshake(UplinkQueueMessage uplinkQueueMessage, Callback callback) { + public void postBmsHandshake(UplinkQueueMessage uplinkQueueMessage, Callback callback) { log.info("接收到BMS充电握手信息 {}", uplinkQueueMessage); BmsHandshakeProto bmsHandshakeProto = uplinkQueueMessage.getBmsHandshakeProto(); String tradeNo = bmsHandshakeProto.getTradeNo(); @@ -435,7 +435,7 @@ public class DefaultPileProtocolService implements PileProtocolService { } @Override - public void onLockStatus(UplinkQueueMessage uplinkQueueMessage, Callback callback) { + public void postLockStatus(UplinkQueueMessage uplinkQueueMessage, Callback callback) { log.info("接收到地锁状态信息 {}", uplinkQueueMessage); GroundLockStatusProto groundLockStatusProto = uplinkQueueMessage.getGroundLockStatusProto(); String pileCode = groundLockStatusProto.getPileCode(); diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java index 4d0bb18..405a7ae 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java @@ -206,7 +206,7 @@ public class ProtocolUplinkConsumerService extends AbstractConsumerService imple } else if (uplinkQueueMsg.hasBmsAbortProto()) { - pileProtocolService.onBmsAbort(uplinkQueueMsg, callback); + pileProtocolService.postBmsAbort(uplinkQueueMsg, callback); } else if (uplinkQueueMsg.hasRestartPileResponse()) { @@ -214,15 +214,15 @@ public class ProtocolUplinkConsumerService extends AbstractConsumerService imple } else if (uplinkQueueMsg.hasBmsHandshakeProto()) { - pileProtocolService.onBmsHandshake(uplinkQueueMsg, callback); + pileProtocolService.postBmsHandshake(uplinkQueueMsg, callback); } else if (uplinkQueueMsg.hasOtaResponse()) { pileProtocolService.onOtaResponse(uplinkQueueMsg, callback); } else if (uplinkQueueMsg.hasGroundLockStatusProto()) { - - pileProtocolService.onLockStatus(uplinkQueueMsg, callback); + + pileProtocolService.postLockStatus(uplinkQueueMsg, callback); } else { 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 58b074c..fabe841 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 @@ -11,7 +11,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import sanbing.jcpp.infrastructure.util.codec.BCDUtil; -import sanbing.jcpp.infrastructure.util.codec.CP56Time2aUtil; import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil; import sanbing.jcpp.infrastructure.util.mdc.MDCUtils; import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil; @@ -108,11 +107,8 @@ public class LvnengV340LoginAckDLCmd extends LvnengDownlinkCmdExe { TracerContextUtil.newTracer(); MDCUtils.recordTracer(); log.info("{} 绿能3.4开始下发对时报文", tcpSession); - ByteBuf syncTimeMsgBody = Unpooled.buffer(14); - syncTimeMsgBody.writeBytes(pileCodeBytes); - syncTimeMsgBody.writeBytes(CP56Time2aUtil.encode(LocalDateTime.now())); - ByteBuf msgBodyBuf = Unpooled.buffer(); + ByteBuf msgBodyBuf = Unpooled.buffer(20); // 预留1 msgBodyBuf.writeShortLE(0); // 预留1 @@ -128,7 +124,7 @@ public class LvnengV340LoginAckDLCmd extends LvnengDownlinkCmdExe { encodeAndWriteFlush(SYNC_TIME, tcpSession.nextSeqNo(SequenceNumberLength.SHORT), requestData.getEncryptionFlag(), - syncTimeMsgBody, + msgBodyBuf, tcpSession); }