yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平台启动暂只有单枪

Browse Source
This commit is contained in:
ZZ 2022-06-11 19:36:25 +08:00
parent 2e79eae4a6
commit f80e03d4c7
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -354,18 +354,12 @@ public class ChargingController {
byte[] data = new byte[0]; byte[] data = new byte[0];
data = ArrayUtils.addAll(data, HexUtils.toBytes("6830".concat(seq).concat("0034"))); data = ArrayUtils.addAll(data, HexUtils.toBytes("6830".concat(seq).concat("0034")));
String version = startChargingData.getVersion(); data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getOrderNo()));
if (default_version.equals(version)) { data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getPileNo()));
data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getOrderNo())); data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getGunId()));
data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getPileNo())); data = ArrayUtils.addAll(data, HexUtils.toBytes(String.format("%016X", Long.parseLong(startChargingData.getLogicCardNo(), 16))));
data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getGunId())); data = ArrayUtils.addAll(data, HexUtils.toBytes(String.format("%016X", Long.parseLong(startChargingData.getPhysicCardNo(), 16))));
data = ArrayUtils.addAll(data, HexUtils.toBytes(String.format("%016X", data = ArrayUtils.addAll(data, HexUtils.toBytes(toHexInt(startChargingData.getBalance())));
Long.parseLong(startChargingData.getLogicCardNo(), 16))));
data = ArrayUtils.addAll(data, HexUtils.toBytes(String.format("%016X", Long.parseLong(startChargingData.getPhysicCardNo(), 16))));
data = ArrayUtils.addAll(data, HexUtils.toBytes(toHexInt(startChargingData.getBalance())));
} else {
// not defined or implemented yet
}
String msg = HexUtils.toHex(data); String msg = HexUtils.toHex(data);
msg = msg.concat(CRCCalculator.calcCrc(msg)); msg = msg.concat(CRCCalculator.calcCrc(msg));
log.debug("start charging order[{}], send msg >>>> |{}|", startChargingData.getOrderNo(), msg); log.debug("start charging order[{}], send msg >>>> |{}|", startChargingData.getOrderNo(), msg);