From 12a33e6219bffefa31864fd66f58e9926ed1392e Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 14 Mar 2022 16:25:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E9=87=8D=E8=BD=BD=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xhpc/pp/controller/ChargingController.java | 4 ++-- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 9a395e02..41d48016 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 @@ -285,8 +285,8 @@ public class ChargingController { } @GetMapping("native/charging/stop/{pileNo}/{connectorId}/{version}") - public R stopInvalidOrder(@PathVariable("pileNo") String pileNo, @PathVariable("connectorId") String connectorId, - @PathVariable("version") String version) { + public R stopCharging(@PathVariable("pileNo") String pileNo, @PathVariable("connectorId") String connectorId, + @PathVariable("version") String version) { ClientHandler handler = ChargingPileServer.getHandler(pileNo); if (handler == null) { 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 fbf0c035..133bae22 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 @@ -154,7 +154,7 @@ public class RealtimeDataLogic implements ServiceLogic { Integer vul = (Integer) cachePile.get("voltageUpperLimits"); Integer cul = (Integer) cachePile.get("currentLimit"); if (wc > cul || wv > vul) { - R r = chargingController.stopInvalidOrder(pileNo, gunId, default_version); + R r = chargingController.stopCharging(pileNo, gunId, default_version); if (r.getCode() == 200) { Integer vcpcnt = (Integer) cacheOrder.get("vcpcnt"); cacheOrder.put("vcpcnt", vcpcnt == null ? 1 : vcpcnt++); @@ -163,7 +163,7 @@ public class RealtimeDataLogic implements ServiceLogic { } else { Integer stopSoc = (Integer) cacheOrder.get("stopSoc"); if (stopSoc != null && socInt >= stopSoc) { - R r = chargingController.stopInvalidOrder(pileNo, gunId, default_version); + R r = chargingController.stopCharging(pileNo, gunId, default_version); String alerted = (String) cacheOrder.get("socalerted"); String tel = (String) cacheOrder.get("tel"); if (alerted == null && tel != null) {