From 63227d69b838577005f3ccfa2c1b0b888dc89951 Mon Sep 17 00:00:00 2001 From: ZZ Date: Wed, 10 Nov 2021 20:32:44 +0800 Subject: [PATCH] =?UTF-8?q?WIP:=E4=B8=89=E6=96=B9=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xhpc/evcs/api/QueryEquipChargeStatusController.java | 2 +- .../java/com/xhpc/evcs/api/QueryStopChargeController.java | 2 +- .../main/java/com/xhpc/common/api/PowerPileService.java | 4 ++-- .../xhpc/common/api/factory/PowerPileFallbackFactory.java | 2 +- .../order/service/impl/XhpcChargeOrderServiceImpl.java | 3 ++- .../java/com/xhpc/pp/controller/ChargingController.java | 8 ++++---- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java index fb328933..02812dec 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java @@ -90,7 +90,7 @@ public class QueryEquipChargeStatusController { equipChargeStatus.setConnectorStatus(connectorStatus); //A相电流 String current = (String) cacheGunData.get("current"); - Double currentA = Double.valueOf(current); + Double currentA = Double.valueOf(current); // todo 16-base/10 equipChargeStatus.setCurrentA(currentA); //A相电压 String voltage = (String) cacheGunData.get("voltage"); diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java index 998724cc..7058554c 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStopChargeController.java @@ -126,7 +126,7 @@ public class QueryStopChargeController { commonResponse.setRet("1"); commonResponse.setMsg("请求停止充电失败"); commonResponse.setData(data); - + return commonResponse; } //设置该订单已经被停止的标识 diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java index d4542958..97530d2b 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/PowerPileService.java @@ -23,9 +23,9 @@ public interface PowerPileService { @PostMapping("/charging/balance/refresh") R refreshBalance(@Validated @RequestBody StartChargingData balanceRefreshData); - @PutMapping("charging/stop/{orderNo}/{pileNo}/{gunId}/{version}") + @PutMapping("charging/stop/{orderNo}/{pileNo}/{connectorId}/{version}") R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo, - @PathVariable("gunId") String gunId, @PathVariable("version") String version); + @PathVariable("connectorId") String connectorId, @PathVariable("version") String version); @PostMapping("/pile/whitelist/add/{stationId}/{version}") R addPileWhitelist(@PathVariable("stationId") Long stationId, diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java index a43cb6a9..7c29e046 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/PowerPileFallbackFactory.java @@ -35,7 +35,7 @@ public class PowerPileFallbackFactory implements FallbackFactory>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<"+oa.getCode()+">>>>>>>>>>>>>>>>>"); logger.info("<<<<<<<<<<<<<<<<<<<<<<<<"+oa.getMsg()+">>>>>>>>>>>>>>>>>"); 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 c7d62f97..feb2597c 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 @@ -132,9 +132,9 @@ public class ChargingController { return R.ok(); } - @PutMapping("charging/stop/{orderNo}/{pileNo}/{gunId}/{version}") + @PutMapping("charging/stop/{orderNo}/{pileNo}/{connectorId}/{version}") public R stopCharging(@PathVariable("orderNo") String orderNo, @PathVariable("pileNo") String pileNo, - @PathVariable("gunId") String gunId, + @PathVariable("connectorId") String connectorId, @PathVariable( "version") String version) { @@ -148,7 +148,7 @@ public class ChargingController { if (!REGISTERED.equals(status)) { r = R.fail("充电桩离线"); } - String gunkey = pkey.concat(gunId).replace("pile", "gun"); + String gunkey = "gun:".concat(connectorId); final Map cacheGun = REDIS.getCacheMap(gunkey); if (cacheGun.get("orderkey") == null || !cacheGun.get("orderkey").toString().endsWith(orderNo) || !orderNo.contains(pileNo)) { r = R.fail("错误的订单号"); @@ -160,7 +160,7 @@ public class ChargingController { String response = HttpUtils.get(fmt(svcSrv) .concat("/native/charging/stop/") .concat(pileNo).concat("/") - .concat(gunId).concat("/") + .concat(connectorId).concat("/") .concat(version)); r = getRR(response); }