Merge remote-tracking branch '红中/master-feat-lvneng-0911'

# Conflicts:
#	jcpp-app/src/main/java/sanbing/jcpp/app/service/PileProtocolService.java
#	jcpp-infrastructure-proto/src/main/proto/downlink.proto
#	jcpp-infrastructure-proto/src/main/proto/uplink.proto
This commit is contained in:
三丙
2025-09-13 16:44:00 +08:00
16 changed files with 644 additions and 5 deletions

View File

@@ -36,8 +36,9 @@ message DownlinkRequestMessage {
OfflineCardSyncRequest offlineCardSyncRequest = 31;
TimeSyncRequest timeSyncRequest = 32;
StartChargeResponse startChargeResponse = 33;
OfflineCardClearRequest offlineCardClearRequest = 34;
OfflineCardQueryRequest offlineCardQueryRequest = 35;
SetQrcodeRequest setQrcodeRequest = 34;
OfflineCardClearRequest offlineCardClearRequest = 35;
OfflineCardQueryRequest offlineCardQueryRequest = 36;
}
// 下行响应消息
@@ -249,6 +250,17 @@ message TimeSyncRequest {
string time = 2;
}
// 设置二维码请求
message SetQrcodeRequest {
string pileCode = 4;
QrcodeModelProto qrcodeModel = 1;
}
message QrcodeModelProto {
string gunName = 11;
string code = 12;
}
message OfflineCardClearRequest {
string pileCode = 1; // 充电桩编码
int32 total = 2; // 清除离线卡的个数

View File

@@ -45,8 +45,9 @@ message UplinkQueueMessage {
TimeSyncResponse timeSyncResponse = 42;
BmsDemandChargerOutputProto bmsDemandChargerOutputProto = 43;
StartChargeRequest startChargeRequest = 44;
OfflineCardClearResponse offlineCardClearResponse = 45;
OfflineCardQueryResponse offlineCardQueryResponse = 46;
SetQrcodeResponse setQrcodeResponse = 45;
OfflineCardClearResponse offlineCardClearResponse = 46;
OfflineCardQueryResponse offlineCardQueryResponse = 47;
}
// 会话关闭事件
@@ -376,3 +377,10 @@ message BmsDemandChargerOutputProto {
string tradeNo = 6;
optional string additionalInfo = 20;
}
// 设置二维码响应
message SetQrcodeResponse {
bool success = 1;
string pileCode = 4;
int32 type = 7;
int32 startAddr = 8;
}