diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index 99a795ee..d7e7aef2 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -354,18 +354,12 @@ public class ChargingController { byte[] data = new byte[0]; data = ArrayUtils.addAll(data, HexUtils.toBytes("6830".concat(seq).concat("0034"))); - String version = startChargingData.getVersion(); - if (default_version.equals(version)) { - data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getOrderNo())); - data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getPileNo())); - data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getGunId())); - data = ArrayUtils.addAll(data, HexUtils.toBytes(String.format("%016X", - 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 - } + data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getOrderNo())); + data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getPileNo())); + data = ArrayUtils.addAll(data, HexUtils.toBytes(startChargingData.getGunId())); + data = ArrayUtils.addAll(data, HexUtils.toBytes(String.format("%016X", 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()))); String msg = HexUtils.toHex(data); msg = msg.concat(CRCCalculator.calcCrc(msg)); log.debug("start charging order[{}], send msg >>>> |{}|", startChargingData.getOrderNo(), msg);