From 3f4bb375a0759057d3405ece18ac2acbfedaaa6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E4=B8=99?= <10604541+sanbing-os@user.noreply.gitee.com> Date: Tue, 5 Aug 2025 19:34:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=91=BD=E5=90=8D=E5=B9=B6?= =?UTF-8?q?=E8=A1=A5=E5=85=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/sanbing/jcpp/app/adapter/TestController.java | 4 ++-- .../jcpp/app/service/impl/DefaultPileProtocolService.java | 2 +- jcpp-infrastructure-proto/src/main/proto/protocol.proto | 2 +- .../java/sanbing/jcpp/protocol/domain/DownlinkCmdEnum.java | 2 +- jcpp-protocol-yunkuaichong/READMD.md | 6 +++++- .../yunkuaichong/enums/YunKuaiChongDownlinkCmdEnum.java | 2 +- ...tULCmd.java => YunKuaiChongV150RestartPileAckULCmd.java} | 2 +- .../v150/cmd/YunKuaiChongV150RestartPileDLCmd.java | 4 ++-- 8 files changed, 14 insertions(+), 10 deletions(-) rename jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/{YunKuaiChongV150RestartPileResultULCmd.java => YunKuaiChongV150RestartPileAckULCmd.java} (96%) diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/TestController.java b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/TestController.java index 3566350..bd9c408 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/TestController.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/adapter/TestController.java @@ -33,8 +33,8 @@ public class TestController { return ResponseEntity.ok("success"); } - @GetMapping("/api/reStartCharge") - public ResponseEntity reStartCharge() { + @GetMapping("/api/restartPile") + public ResponseEntity restartPile() { pileProtocolService.restartPile("20231212000010", 1); 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 7f8e689..a284c86 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 @@ -310,7 +310,7 @@ public class DefaultPileProtocolService implements PileProtocolService { .setPileCode(pileCode) .setRequestIdMSB(requestId.getMostSignificantBits()) .setRequestIdLSB(requestId.getLeastSignificantBits()) - .setDownlinkCmd(DownlinkCmdEnum.REMOTE_RE_START_CHARGING.name()) + .setDownlinkCmd(DownlinkCmdEnum.REMOTE_RESTART_PILE.name()) .setRestartPileRequest(RestartPileRequest.newBuilder() .setPileCode(pileCode) .setType(type) diff --git a/jcpp-infrastructure-proto/src/main/proto/protocol.proto b/jcpp-infrastructure-proto/src/main/proto/protocol.proto index 5d75192..be6f235 100644 --- a/jcpp-infrastructure-proto/src/main/proto/protocol.proto +++ b/jcpp-infrastructure-proto/src/main/proto/protocol.proto @@ -248,7 +248,7 @@ message RemoteStartChargingRequest { message RestartPileRequest { string pileCode = 4; int32 type = 7; - + optional string additionalInfo = 20; } message RemoteStartChargingResponse { diff --git a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/DownlinkCmdEnum.java b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/DownlinkCmdEnum.java index bde9707..39767f6 100644 --- a/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/DownlinkCmdEnum.java +++ b/jcpp-protocol-api/src/main/java/sanbing/jcpp/protocol/domain/DownlinkCmdEnum.java @@ -27,5 +27,5 @@ public enum DownlinkCmdEnum { REMOTE_PARALLEL_START_CHARGING, - REMOTE_RE_START_CHARGING, + REMOTE_RESTART_PILE, } \ No newline at end of file diff --git a/jcpp-protocol-yunkuaichong/READMD.md b/jcpp-protocol-yunkuaichong/READMD.md index ac07bfb..e5e67f6 100644 --- a/jcpp-protocol-yunkuaichong/READMD.md +++ b/jcpp-protocol-yunkuaichong/READMD.md @@ -76,9 +76,13 @@ #### 0x1D 充电阶段BMS中止 `68 20 00 18 00 1D 20 23 12 12 00 00 01 01 11 51 11 61 55 53 50 26 20 23 12 12 00 00 10 01 00 00 00 00 5a 23` +--- + +#### 0x92 远程重启 +`68 0f 03 00 00 92 20 23 12 12 00 00 10 00 00 00 01 37 2b` #### 0x91 远程重启应答 -`68 0C 00 11 00 91 20 23 12 12 00 00 10 01 03 F2` +`68 0C 00 11 00 91 20 23 12 12 00 00 10 01 F2 03` --- diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/enums/YunKuaiChongDownlinkCmdEnum.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/enums/YunKuaiChongDownlinkCmdEnum.java index b85618b..eb5b3b8 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/enums/YunKuaiChongDownlinkCmdEnum.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/enums/YunKuaiChongDownlinkCmdEnum.java @@ -36,7 +36,7 @@ public enum YunKuaiChongDownlinkCmdEnum { REMOTE_PARALLEL_START_CHARGING(0xA4), - REMOTE_RE_START_CHARGING(0x92); + REMOTE_RESTART_PILE(0x92); private final Integer cmd; diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileResultULCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java similarity index 96% rename from jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileResultULCmd.java rename to jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java index 4098fa1..9b2e254 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileResultULCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileAckULCmd.java @@ -24,7 +24,7 @@ import sanbing.jcpp.protocol.yunkuaichong.annotation.YunKuaiChongCmd; */ @Slf4j @YunKuaiChongCmd(0x91) -public class YunKuaiChongV150RestartPileResultULCmd extends YunKuaiChongUplinkCmdExe { +public class YunKuaiChongV150RestartPileAckULCmd extends YunKuaiChongUplinkCmdExe { @Override public void execute(TcpSession tcpSession, YunKuaiChongUplinkMessage yunKuaiChongUplinkMessage, ProtocolContext ctx) { diff --git a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java index a28979d..c69cd3d 100644 --- a/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java +++ b/jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RestartPileDLCmd.java @@ -16,7 +16,7 @@ import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongDownlinkCmdExe; import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongDwonlinkMessage; import sanbing.jcpp.protocol.yunkuaichong.annotation.YunKuaiChongCmd; -import static sanbing.jcpp.protocol.yunkuaichong.enums.YunKuaiChongDownlinkCmdEnum.REMOTE_RE_START_CHARGING; +import static sanbing.jcpp.protocol.yunkuaichong.enums.YunKuaiChongDownlinkCmdEnum.REMOTE_RESTART_PILE; /** * 云快充1.5.0 运营平台远程重启充电桩 @@ -41,7 +41,7 @@ public class YunKuaiChongV150RestartPileDLCmd extends YunKuaiChongDownlinkCmdExe msgBody.writeBytes(encodePileCode(pileCode)); // 0x01：立即执行 0x02：空闲执行 msgBody.writeInt(type); - encodeAndWriteFlush(REMOTE_RE_START_CHARGING, + encodeAndWriteFlush(REMOTE_RESTART_PILE, msgBody, tcpSession); }