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 915cf580..bd8aae44 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 @@ -217,7 +217,7 @@ public class ChargingController { if (!"空闲".equals(gunstatus)) { return R.fail("端口不在空闲或正常状态,稍后再试"); } - if (CacheDataUtils.hori(gunkey)) return R.fail("等待上一条指令响应"); + if (CacheDataUtils.hori(gunkey)) return R.fail("请检查终端号是否正确,稍后再试"); String skey = gunkey.concat(".seqhex"); String seq = seqHex(skey); byte[] msg = translateStart(startChargingData, seq); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 56438e1d..e43e588c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -105,13 +105,13 @@ public class RealtimeDataLogic implements ServiceLogic { Integer balance = (Integer) cacheOrder.get("balance"); CacheRealtimeData cacheRealtimeData = translate(realtimeData); balance -= cacheRealtimeData.getAmountCharged(); -// startChargingData.setBalance(balance); //todo make pile work then uncomment -// startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString()); -// startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString()); -// startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); -// startChargingData.setGunId(cacheOrder.get("gunId").toString()); + startChargingData.setBalance(balance); //todo make pile work then uncomment + startChargingData.setLogicCardNo(cacheOrder.get("logicCardNo").toString()); + startChargingData.setPhysicCardNo(cacheOrder.get("physicCardNo").toString()); + startChargingData.setPileNo(cacheOrder.get("pileNo").toString()); + startChargingData.setGunId(cacheOrder.get("gunId").toString()); Thread.sleep(300); -// chargingController.nativeRefreshBalance(startChargingData); + chargingController.nativeRefreshBalance(startChargingData); cacheRealtimeData.setCreateTime(DateUtil.now()); String lord = orderkey.concat(".lord"); REDIS.setCacheObject(lord, cacheRealtimeData);