From 603edc89e22be50ab70343526a48441f09ba1a96 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Tue, 20 Sep 2022 17:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0VIN=E7=A0=81=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E7=9A=84=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pp/logic/PileStartChargingDataLogic.java | 18 ++++++++++++++---- .../com/xhpc/pp/logic/RealtimeDataLogic.java | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java index 750d5fb7..d7425246 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/PileStartChargingDataLogic.java @@ -221,10 +221,10 @@ public class PileStartChargingDataLogic implements ServiceLogic { String failReason = ""; switch (code){ case 1888: failReason = Constants.EMPTY_VIN; break; - case 1880: failReason = Constants.INVALID_VIN;break; - case 1881: failReason = Constants.UNEXIST_VIN;break; - case 1104: failReason = Constants.UNUSE_TERMINAL;break; - case 1103: failReason = Constants.EXCEPTION_ORDER;break; + case 1880: failReason = Constants.INVALID_VIN; break; + case 1881: failReason = Constants.UNEXIST_VIN; break; + case 1104: failReason = Constants.UNUSE_TERMINAL; break; + case 1103: failReason = Constants.EXCEPTION_ORDER; break; case 1100: failReason = Constants.INSUFFICIENT_ACCOUNT; break; case 1101: failReason = Constants.REFUND_ORDER; break; case 1102: failReason = Constants.CHARGE_ORDER; break; @@ -235,6 +235,16 @@ public class PileStartChargingDataLogic implements ServiceLogic { case 1109: failReason = Constants.INSERT_THE_GUN; break; case 1111: failReason = Constants.FAULT_TERMINAL; break; case 1112: failReason = Constants.CHARGE_TERMINAL; break; + case 1200: failReason = Constants.INVALID_USER; break; + case 1201: failReason = Constants.INVALID_OPERATOR; break; + case 1202: failReason = Constants.OFFLINE_CARD; break; + case 1203: failReason = Constants.ZERO_CARD; break; + case 1204: failReason = Constants.TWO_CARD; break; + case 1205: failReason = Constants.THREE_CARD; break; + case 1206: failReason = Constants.FOUR_CARD; break; + case 1207: failReason = Constants.INVALID_CARD; break; + case 1208: + failReason = Constants.INVALID_RATE_MODE; break; default: failReason = Constants.INTERNAL_ERROR; break; } 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 6acd6880..6ee4c87a 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 @@ -67,7 +67,7 @@ public class RealtimeDataLogic implements ServiceLogic { Map cacheGun = REDIS.getCacheMap(gunkey); int statusInt = Integer.parseInt(realtimeData.getStatus()); String statusplain = stable[statusInt]; - cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]); + cacheGun.put("pileGunStatus", stable[Integer.parseInt(realtimeData.getPileGunStatus())]); cacheGun.put("vehicleGunStatus", pvgstable[Integer.parseInt(realtimeData.getVehicleGunStatus())]); double wv = reverseHexInt(realtimeData.getWorkingVoltage()) / 10.0; cacheGun.put("voltage", wv);