From d5bbfca20f5575324de6d690289a30947669749e Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 12 Nov 2021 15:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NotificationChargeOrderInfo4BonusTask.java | 7 ++++++- .../NotificationStopChargeResultTask.java | 1 - .../xhpc/pp/controller/ChargingController.java | 16 ++++++++-------- .../src/main/resources/bootstrap.yml | 4 ++-- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java index 510a172a..8f4a37f8 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationChargeOrderInfo4BonusTask.java @@ -64,7 +64,12 @@ public class NotificationChargeOrderInfo4BonusTask extends CoreDispatcher { if (operatorIdEvcs == null) { Long chargingStationId = xhpcHistoryOrder.getChargingStationId(); XhpcChargingStation station = chargingStationRepo.findById(chargingStationId).orElse(null); - operatorIdEvcs = station.getOperatorIdEvcs(); + String stationOperatorIdEvcs = station.getOperatorIdEvcs(); + if (stationOperatorIdEvcs == null) { + logger.error("station[{}] operator id evcs not set", chargingStationId); + return; + } + operatorIdEvcs = stationOperatorIdEvcs.substring(8, 17); } EtOrderMapping etOrderMapping = saveOrderMapping(xhpcHistoryOrder, orderMappingRepository, operatorIdEvcs); CDChargeOrderInfo4BonusReq cdChargeOrderInfo4BonusReq = new CDChargeOrderInfo4BonusReq(xhpcHistoryOrder, diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java index de7cbd81..6638736f 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationStopChargeResultTask.java @@ -86,7 +86,6 @@ public class NotificationStopChargeResultTask extends CoreDispatcher { chargeResultRequestCommonRequest.setData(jsonData); String result = ok(chargeResultRequestCommonRequest, "/notification_stop_charge_result", authSecretTokenOut, operatorId3rdpty); - ChargeResultResponse chargeResultResponse = JSONUtil.readParams(result, ChargeResultResponse.class); succStat = chargeResultResponse.getSuccStat(); //推送成功则排除这个已推送的订单，否则则继续推送该订单 // 用于测试暂时注释 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 c7825d79..6f6fb405 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 @@ -270,8 +270,9 @@ public class ChargingController { } } - @GetMapping("native/charging/stop/{pileNo}/{gunId}/{version}") - public R nativeStopCharging(@PathVariable("pileNo") String pileNo, @PathVariable("gunId") String gunId, @PathVariable("version") String version) { + @GetMapping("native/charging/stop/{pileNo}/{connectorId}/{version}") + public R nativeStopCharging(@PathVariable("pileNo") String pileNo, @PathVariable("connectorId") String connectorId, + @PathVariable("version") String version) { ClientHandler handler = ChargingPileServer.getHandler(pileNo); if (handler == null) { @@ -281,10 +282,10 @@ public class ChargingController { try { String pileKey = "pile:".concat(pileNo); if (CacheDataUtils.hori(pileKey)) return R.fail("充电桩正在忙碌,请重试"); - String gunkey = "gun:".concat(pileNo).concat(gunId); + String gunkey = "gun:".concat(pileNo).concat(connectorId); String skey = gunkey.concat(".seqhex"); String seq = seqHex(skey); - byte[] msg = translateStop(pileNo, gunId, version, seq); + byte[] msg = translateStop(connectorId, version, seq); if (!handler.isOpen()) { log.error("send message failed. [{}]({}) connection lost", handler.getName(), pileNo); removeHandler(pileNo); @@ -322,17 +323,16 @@ public class ChargingController { return HexUtils.toBytes(msg); } - private byte[] translateStop(String pileNo, String gunId, String version, String seq) { + private byte[] translateStop(String connectorId, String version, String seq) { byte[] data = new byte[0]; data = ArrayUtils.addAll(data, HexUtils.toBytes("680C".concat(seq).concat("0036"))); if (default_version.equals(version)) { - data = ArrayUtils.addAll(data, HexUtils.toBytes(pileNo)); - data = ArrayUtils.addAll(data, HexUtils.toBytes(gunId)); + data = ArrayUtils.addAll(data, HexUtils.toBytes(connectorId)); } String msg = HexUtils.toHex(data); msg = msg.concat(CRCCalculator.calcCrc(msg)); - log.info("stop charging, send msg to terminal ({}{}) >>>> {}", pileNo, gunId, msg); + log.info("stop charging, send msg to terminal ({}) >>>> {}", connectorId, msg); return HexUtils.toBytes(msg); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml index 8c12f14b..df3a5bc9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/bootstrap.yml @@ -18,10 +18,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.31.183.135:8848 config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 172.31.183.135:8848 # 配置文件格式 file-extension: yml # 共享配置