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

修正领域模型命名问题

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

8
jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsParamConfigReportULCmd.java
View File

@@ -11,7 +11,7 @@ import io.netty.buffer.Unpooled;
import lombok.extern.slf4j.Slf4j;
import sanbing.jcpp.infrastructure.util.codec.BCDUtil;
import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil;
import sanbing.jcpp.proto.gen.ProtocolProto.BmsParamConfigReport;
import sanbing.jcpp.proto.gen.ProtocolProto.BmsParamConfigReportProto;
import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage;
import sanbing.jcpp.protocol.ProtocolContext;
import sanbing.jcpp.protocol.listener.tcp.TcpSession;
@@ -92,7 +92,7 @@ public class YunKuaiChongV150BmsParamConfigReportULCmd extends YunKuaiChongUplin
BigDecimal pileMinOutputCurrent = readCurrent(byteBuf);
// 转发到后端
BmsParamConfigReport bmsParamConfigReport = BmsParamConfigReport.newBuilder()
BmsParamConfigReportProto bmsParamConfigReportProto = BmsParamConfigReportProto.newBuilder()
.setTs(ts)
.setPileCode(pileCode)
.setTradeNo(tradeNo)
@@ -109,8 +109,8 @@ public class YunKuaiChongV150BmsParamConfigReportULCmd extends YunKuaiChongUplin
.setPileMaxOutputCurrent(pileMaxOutputCurrent.toPlainString())
.setPileMinOutputCurrent(pileMinOutputCurrent.toPlainString())
.build();
UplinkQueueMessage uplinkQueueMessage = uplinkMessageBuilder(bmsParamConfigReport.getPileCode(), tcpSession, yunKuaiChongUplinkMessage)
.setBmsParamConfigReport(bmsParamConfigReport)
UplinkQueueMessage uplinkQueueMessage = uplinkMessageBuilder(bmsParamConfigReportProto.getPileCode(), tcpSession, yunKuaiChongUplinkMessage)
.setBmsParamConfigReportProto(bmsParamConfigReportProto)
.build();
tcpSession.getForwarder().sendMessage(uplinkQueueMessage);

6
jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordAckDLCmd.java
View File

@@ -10,7 +10,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import lombok.extern.slf4j.Slf4j;
import sanbing.jcpp.infrastructure.util.jackson.JacksonUtil;
import sanbing.jcpp.proto.gen.ProtocolProto.TransactionRecordAck;
import sanbing.jcpp.proto.gen.ProtocolProto.TransactionRecordResponse;
import sanbing.jcpp.protocol.ProtocolContext;
import sanbing.jcpp.protocol.listener.tcp.TcpSession;
import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongDownlinkCmdExe;
@@ -33,11 +33,11 @@ public class YunKuaiChongV150TransactionRecordAckDLCmd extends YunKuaiChongDownl
public void execute(TcpSession tcpSession, YunKuaiChongDwonlinkMessage yunKuaiChongDwonlinkMessage, ProtocolContext ctx) {
log.info("{} 云快充1.5.0交易记录确认", tcpSession);
if (!yunKuaiChongDwonlinkMessage.getMsg().hasTransactionRecordAck()) {
if (!yunKuaiChongDwonlinkMessage.getMsg().hasTransactionRecordResponse()) {
return;
}
TransactionRecordAck transactionRecordAck = yunKuaiChongDwonlinkMessage.getMsg().getTransactionRecordAck();
TransactionRecordResponse transactionRecordAck = yunKuaiChongDwonlinkMessage.getMsg().getTransactionRecordResponse();
YunKuaiChongUplinkMessage requestData = JacksonUtil.fromBytes(yunKuaiChongDwonlinkMessage.getMsg().getRequestData().toByteArray(), YunKuaiChongUplinkMessage.class);

4
jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150TransactionRecordULCmd.java
View File

@@ -172,7 +172,7 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
.build();
// 构建交易记录
TransactionRecord transactionRecord = TransactionRecord.newBuilder()
TransactionRecordRequest transactionRecordRequest = TransactionRecordRequest.newBuilder()
.setPileCode(pileCode)
.setGunCode(gunCode)
.setTradeNo(tradeNo)
@@ -188,7 +188,7 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
// 转发到后端
UplinkQueueMessage uplinkQueueMessage = uplinkMessageBuilder(pileCode, tcpSession, yunKuaiChongUplinkMessage)
.setTransactionRecord(transactionRecord)
.setTransactionRecordRequest(transactionRecordRequest)
.build();
tcpSession.getForwarder().sendMessage(uplinkQueueMessage);