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

云快充1.5.0 金额单位修正为元

Browse Source
This commit is contained in:
三丙
2024-10-08 16:56:29 +08:00
committed by 三丙
parent b5370cee6c
commit 791039fabd
13 changed files with 74 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150RealTimeDataULCmd.java
View File

@@ -122,7 +122,7 @@ public class YunKuaiChongV150RealTimeDataULCmd extends YunKuaiChongUplinkCmdExe
BigDecimal loseEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000, 4);
// 17.已充金额 （电费+服务费）*计损充电度数
BigDecimal chargeAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 100);
BigDecimal chargeAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
// 18.硬件故障 测试发现需要使用小端计算bit, 然后对照故障表查询故障码
byte[] warnCodeBytes = new byte[2];
@@ -155,12 +155,12 @@ public class YunKuaiChongV150RealTimeDataULCmd extends YunKuaiChongUplinkCmdExe
.setPileCode(pileCode)
.setGunCode(gunCode)
.setTradeNo(tradeNo)
.setOutputVoltage(outputVoltage.floatValue())
.setOutputCurrent(outputCurrent.floatValue())
.setOutputVoltage(outputVoltage.toPlainString())
.setOutputCurrent(outputCurrent.toPlainString())
.setSoc(soc)
.setTotalChargingDurationMin(totalChargeTime)
.setTotalChargingEnergyKWh(loseEnergy.floatValue())
.setTotalChargingCostCent(chargeAmount.longValue())
.setTotalChargingEnergyKWh(loseEnergy.toPlainString())
.setTotalChargingCostYuan(chargeAmount.toPlainString())
.setAdditionalInfo(additionalInfo.toString());
UplinkQueueMessage chargingProgressMessage = uplinkMessageBuilder(pileCode, tcpSession, yunKuaiChongUplinkMessage)
@@ -169,7 +169,6 @@ public class YunKuaiChongV150RealTimeDataULCmd extends YunKuaiChongUplinkCmdExe
tcpSession.getForwarder().sendMessage(chargingProgressMessage);
}
}
/**

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

@@ -39,7 +39,7 @@ public class YunKuaiChongV150RemoteStartDLCmd extends YunKuaiChongDownlinkCmdExe
String pileCode = remoteStartChargingRequest.getPileCode();
String gunCode = remoteStartChargingRequest.getGunCode();
String tradeNo = remoteStartChargingRequest.getTradeNo();
int limitCent = remoteStartChargingRequest.getLimitCent();
int limitYuan = remoteStartChargingRequest.getLimitYuan();
byte[] cardNo = encodeCardNo(tradeNo);
@@ -55,7 +55,7 @@ public class YunKuaiChongV150RemoteStartDLCmd extends YunKuaiChongDownlinkCmdExe
// 物理卡号
msgBody.writeBytes(cardNo);
// 账户余额
msgBody.writeIntLE(limitCent);
msgBody.writeIntLE(limitYuan);
encodeAndWriteFlush(REMOTE_START_CHARGING,
msgBody,

2
jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150SetPricingModelDLCmd.java
View File

@@ -59,7 +59,7 @@ public class YunKuaiChongV150SetPricingModelDLCmd extends YunKuaiChongDownlinkCm
setPricingAckMsgBody.writeBytes(encodePricingId(pricingId));
// 4字节电价+4字节服务费
BigDecimal accurate = new BigDecimal(1000);
BigDecimal accurate = new BigDecimal(100000);
setPricingAckMsgBody.writeIntLE(new BigDecimal(flagPriceMap.get(TOP.ordinal()).getElec()).multiply(accurate).intValue());
setPricingAckMsgBody.writeIntLE(new BigDecimal(flagPriceMap.get(TOP.ordinal()).getServ()).multiply(accurate).intValue());
setPricingAckMsgBody.writeIntLE(new BigDecimal(flagPriceMap.get(PEAK.ordinal()).getElec()).multiply(accurate).intValue());

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

@@ -63,7 +63,7 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
Instant endTime = CP56Time2aUtil.decode(endTimeBytes);
// 6.尖单价
BigDecimal topPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 1000);
BigDecimal topPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 100000);
additionalInfo.put("尖单价", topPrice);
// 7. 尖电量
BigDecimal topEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
@@ -71,10 +71,10 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
BigDecimal topLoseEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
additionalInfo.put("计损尖电量", topLoseEnergy);
// 9.尖金额
BigDecimal topAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 100);
BigDecimal topAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
// 10.峰单价
BigDecimal peakPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 1000);
BigDecimal peakPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 100000);
additionalInfo.put("峰单价", peakPrice);
// 11. 峰电量
BigDecimal peakEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
@@ -82,10 +82,10 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
BigDecimal peakLoseEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
additionalInfo.put("计损峰电量", peakLoseEnergy);
// 13.峰金额
BigDecimal peakAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 100);
BigDecimal peakAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
// 14.平单价
BigDecimal flatPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 1000);
BigDecimal flatPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 100000);
additionalInfo.put("平单价", flatPrice);
// 15. 平电量
BigDecimal flatEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
@@ -93,10 +93,10 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
BigDecimal flatLoseEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
additionalInfo.put("计损平电量", flatLoseEnergy);
// 17.平金额
BigDecimal flatAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 100);
BigDecimal flatAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
// 18.谷单价
BigDecimal valleyPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 1000);
BigDecimal valleyPrice = reduceMagnification(byteBuf.readUnsignedIntLE(), 100000);
additionalInfo.put("谷单价", valleyPrice);
// 19. 谷电量
BigDecimal valleyEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
@@ -104,7 +104,7 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
BigDecimal valleyLoseEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
additionalInfo.put("计损谷电量", valleyLoseEnergy);
// 21.谷金额
BigDecimal valleyAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 100);
BigDecimal valleyAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
// 22.电表总起值
byte[] meterStartValueBytes = new byte[5];
@@ -124,7 +124,7 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
BigDecimal totalLoseEnergy = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000, 4);
additionalInfo.put("计损总电量", totalLoseEnergy);
// 26 .消费金额
BigDecimal totalAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 100);
BigDecimal totalAmount = reduceMagnification(byteBuf.readUnsignedIntLE(), 10000);
// 27.电动汽车唯一标识
byte[] carVINBytes = new byte[17];
@@ -157,16 +157,16 @@ public class YunKuaiChongV150TransactionRecordULCmd extends YunKuaiChongUplinkCm
.setTradeNo(tradeNo)
.setStartTs(startTime.toEpochMilli())
.setEndTs(endTime.toEpochMilli())
.setTopEnergyKWh(topEnergy.floatValue())
.setTopAmountCent(topAmount.longValue())
.setPeakEnergyKWh(peakEnergy.floatValue())
.setPeakAmountCent(peakAmount.longValue())
.setFlatEnergyKWh(flatEnergy.floatValue())
.setFlatAmountCent(flatAmount.longValue())
.setValleyEnergyKWh(valleyEnergy.floatValue())
.setValleyAmountCent(valleyAmount.longValue())
.setTotalEnergyKWh(totalEnergy.floatValue())
.setTotalAmountCent(totalAmount.longValue())
.setTopEnergyKWh(topEnergy.toPlainString())
.setTopAmountYuan(topAmount.toPlainString())
.setPeakEnergyKWh(peakEnergy.toPlainString())
.setPeakAmountYuan(peakAmount.toPlainString())
.setFlatEnergyKWh(flatEnergy.toPlainString())
.setFlatAmountYuan(flatAmount.toPlainString())
.setValleyEnergyKWh(valleyEnergy.toPlainString())
.setValleyAmountYuan(valleyAmount.toPlainString())
.setTotalEnergyKWh(totalEnergy.toPlainString())
.setTotalAmountYuan(totalAmount.toPlainString())
.setTradeTs(tradeTime.toEpochMilli())
.setStopReason(stopReason)
.setAdditionalInfo(additionalInfo.toString())