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

修正领域模型命名问题

Browse Source
This commit is contained in:
三丙
2025-08-18 15:16:25 +08:00
parent b393f5b426
commit 6b054c31a9
10 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ public interface PileProtocolService {
/**
* 交易记录上报
*/
void onTransactionRecord(UplinkQueueMessage uplinkQueueMessage, Callback callback);
void onTransactionRecordRequest(UplinkQueueMessage uplinkQueueMessage, Callback callback);
/**
* 启动充电

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

@@ -252,19 +252,18 @@ public class DefaultPileProtocolService implements PileProtocolService {
}
@Override
public void onTransactionRecord(UplinkQueueMessage uplinkQueueMessage, Callback callback) {
public void onTransactionRecordRequest(UplinkQueueMessage uplinkQueueMessage, Callback callback) {
log.info("接收到充电桩交易记录上报 {}", uplinkQueueMessage);
// todo 毛都不敢先给个回复
TransactionRecord transactionRecord = uplinkQueueMessage.getTransactionRecord();
TransactionRecordRequest transactionRecordRequest = uplinkQueueMessage.getTransactionRecordRequest();
String tradeNo = transactionRecord.getTradeNo();
String pileCode = transactionRecord.getPileCode();
String tradeNo = transactionRecordRequest.getTradeNo();
String pileCode = transactionRecordRequest.getPileCode();
// 构造下行计费
DownlinkRequestMessage.Builder downlinkMessageBuilder = createDownlinkMessageBuilder(uplinkQueueMessage, pileCode);
downlinkMessageBuilder.setDownlinkCmd(DownlinkCmdEnum.TRANSACTION_RECORD_ACK.name());
downlinkMessageBuilder.setTransactionRecordAck(TransactionRecordAck.newBuilder()
downlinkMessageBuilder.setTransactionRecordResponse(TransactionRecordResponse.newBuilder()
.setTradeNo(tradeNo)
.setSuccess(true)
.build());

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

@@ -63,7 +63,7 @@ public class AppConsumerStats {
gunRunStatusCounter.increment();
} else if (msg.hasChargingProgressProto()) {
chargingProgressCounter.increment();
} else if (msg.hasTransactionRecord()) {
} else if (msg.hasTransactionRecordRequest()) {
transactionRecordCounter.increment();
}

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

@@ -188,15 +188,15 @@ public class ProtocolUplinkConsumerService extends AbstractConsumerService imple
pileProtocolService.onRemoteStopChargingResponse(uplinkQueueMsg, callback);
} else if (uplinkQueueMsg.hasTransactionRecord()) {
} else if (uplinkQueueMsg.hasTransactionRecordRequest()) {
pileProtocolService.onTransactionRecord(uplinkQueueMsg, callback);
pileProtocolService.onTransactionRecordRequest(uplinkQueueMsg, callback);
} else if (uplinkQueueMsg.hasBmsChargingErrorProto()) {
pileProtocolService.onBmsChargingErrorProto(uplinkQueueMsg, callback);
} else if (uplinkQueueMsg.hasBmsParamConfigReport()) {
} else if (uplinkQueueMsg.hasBmsParamConfigReportProto()) {
pileProtocolService.onBmsParamConfigReport(uplinkQueueMsg, callback);