From f80e03d4c75d13bb80838c92f5447c4d91b9f545 Mon Sep 17 00:00:00 2001 From: ZZ Date: Sat, 11 Jun 2022 19:36:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=90=AF=E5=8A=A8=E6=9A=82?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=8D=95=E6=9E=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/pp/controller/ChargingController.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) 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);