From 432daba37a32117411cff55a10b42cf721a813ce Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 18 Aug 2023 14:23:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8D=A0=E6=A1=A9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RemoteControlGroundLockResponseHandler.java | 12 +++++++++--- .../service/impl/OrderPileOccupyServiceImpl.java | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java index 3fe10e445..bcda90380 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteControlGroundLockResponseHandler.java @@ -72,18 +72,20 @@ public class RemoteControlGroundLockResponseHandler extends AbstractHandler{ if (StringUtils.equals(controlResult, "01")) { // 鉴权成功 - updateOrder(pileSn, connectorCode); + lowerTheGroundLock(pileSn, connectorCode); } return null; } /** * 降锁成功的时候调用 + * lowerTheGroundLock + * raiseTheGroundLock * @param pileSn * @param connectorCode */ - private void updateOrder(String pileSn, String connectorCode) { - // 查出占桩订单，将开始时间set进订单信息 + private void lowerTheGroundLock(String pileSn, String connectorCode) { + // 查出占桩订单 草稿单 ，将开始时间set进订单信息 OrderPileOccupy orderInfo = orderPileOccupyService.getOrderInfoByPile(pileSn, connectorCode); if (orderInfo == null) { @@ -96,4 +98,8 @@ public class RemoteControlGroundLockResponseHandler extends AbstractHandler{ orderPileOccupyService.updateByPrimaryKey(orderInfo); } } + + private void raiseTheGroundLock(String pileSn, String connectorCode) { + orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 7cad100cc..625fcaa64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -176,11 +176,11 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { } /** - * 收到地锁升起指令，调用这个方法，停止计时 * 占桩订单停止计费/停止占桩订单计费 + * 收到地锁升起指令，调用这个方法，停止计时 * - * @param pileSn - * @param connectorCode + * @param pileSn 充电站编号 + * @param connectorCode 枪口号 */ @Override public void stopOccupyPileOrder(String pileSn, String connectorCode) {