autumn/JChargePointProtocol
1
0
Fork 0
mirror of https://gitee.com/san-bing/JChargePointProtocol synced 2026-05-05 02:19:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正云快充OTA升级中的一些BUG，并优化代码

Browse Source
This commit is contained in:
三丙
2025-08-13 20:02:41 +08:00
parent 80fb741692
commit b393f5b426
10 changed files with 110 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jcpp-app/src/main/java/sanbing/jcpp/app/adapter/TestController.java
View File

@@ -155,11 +155,11 @@ public class TestController {
}
@GetMapping("/api/remoteUpdate")
public ResponseEntity<String> remoteUpdate() {
@GetMapping("/api/otaRequest")
public ResponseEntity<String> otaRequest() {
pileProtocolService.remoteUpdate(ProtocolProto.OtaRequest.newBuilder()
.setAddress("http://127.0.0.1")
pileProtocolService.otaRequest(ProtocolProto.OtaRequest.newBuilder()
.setAddress("127.0.0.1")
.setExecutionControl(1)
.setDownloadTimeout(1)
.setPassword("123123")

4
jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java
View File

@@ -115,12 +115,12 @@ public interface PileProtocolService {
/**
* 远程更新
*/
void remoteUpdate(ProtocolProto.OtaRequest request);
void otaRequest(ProtocolProto.OtaRequest request);
/**
* 远程更新应答
*/
void onRemoteUpdate(UplinkQueueMessage uplinkQueueMessage, Callback callback);
void onOtaResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback);
/*
* BMS充电握手

6
jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java
View File

@@ -379,7 +379,7 @@ public class DefaultPileProtocolService implements PileProtocolService {
}
@Override
public void remoteUpdate(OtaRequest request) {
public void otaRequest(OtaRequest request) {
UUID messageId = UUID.randomUUID();
UUID requestId = UUID.randomUUID();
@@ -390,14 +390,14 @@ public class DefaultPileProtocolService implements PileProtocolService {
.setPileCode(request.getPileCode())
.setRequestIdMSB(requestId.getMostSignificantBits())
.setRequestIdLSB(requestId.getLeastSignificantBits())
.setDownlinkCmd(DownlinkCmdEnum.REMOTE_UPDATE.name())
.setDownlinkCmd(DownlinkCmdEnum.OTA_REQUEST.name())
.setOtaRequest(request);
downlinkCallService.sendDownlinkMessage(downlinkRequestMessageBuilder,request.getPileCode());
}
@Override
public void onRemoteUpdate(UplinkQueueMessage uplinkQueueMessage, Callback callback) {
public void onOtaResponse(UplinkQueueMessage uplinkQueueMessage, Callback callback) {
log.info("接收到充电桩更新应答 {}", uplinkQueueMessage);

2
jcpp-app/src/main/java/sanbing/jcpp/app/service/queue/consumer/ProtocolUplinkConsumerService.java
View File

@@ -218,7 +218,7 @@ public class ProtocolUplinkConsumerService extends AbstractConsumerService imple
} else if (uplinkQueueMsg.hasOtaResponse()) {
pileProtocolService.onRemoteUpdate(uplinkQueueMsg, callback);
pileProtocolService.onOtaResponse(uplinkQueueMsg, callback);
} else {