From 59539734375eb7ddf30b34c84d71f1e68b7d400e Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 20 Sep 2023 14:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A0=E6=A1=A9=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GroundLockDataUploadHandler.java | 31 +++++++++---------- .../impl/OrderPileOccupyServiceImpl.java | 1 + 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java index 5c3e3dde8..2cda02794 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java @@ -162,25 +162,24 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ */ private void raiseTheGroundLock(String pileSn, String connectorCode) { // 两种情况 1是没有停车，地锁自动升起；2是停车完成地锁升起 - boolean stopCarFlag = true; + // boolean stopCarFlag = true; - // 获取现在缓存中的状态 - String redisKey = CacheConstants.GROUND_LOCK_DATA + pileSn + connectorCode; - GroundLockData data = redisCache.getCacheObject(redisKey); - if (data != null) { - String parkingStatus = data.getParkingStatus(); - if (StringUtils.equals(parkingStatus, "00")) { - // 无车辆 - stopCarFlag = false; - } + // 获取现在缓存中占桩订单编号 + String redisKey = CacheConstants.GROUND_LOCK_OCCUPY_ORDER + pileSn + connectorCode; + String occupyCode = redisCache.getCacheObject(redisKey); + if (StringUtils.isBlank(occupyCode)) { + log.info("桩号：{}， 枪口：{}未查询到占桩订单", pileSn, connectorCode); + return; } - - if (stopCarFlag) { - // 停止占桩订单计时 - orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode); - } else { - // 关闭占桩订单 + // 根据占桩订单号查询订单信息 + OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryByOccupyCode(occupyCode); + String orderStatus = orderPileOccupy.getStatus(); + if (StringUtils.equals(OccupyOrderStatusEnum.DRAFT_ORDER.getCode(), orderStatus)) { + // 草稿单，关闭占桩订单 orderPileOccupyService.closeOccupyPileOrder(pileSn, connectorCode); + }else { + // 占桩订单，停止占桩订单计时 + orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode); } String occupyOrderKey = CacheConstants.GROUND_LOCK_OCCUPY_ORDER + 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 0d8707ada..a8c0305d1 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 @@ -495,6 +495,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { @Override public void closeOccupyPileOrder(String pileSn, String connectorCode) { + log.info("关闭占桩订单 pileSn:{}, connectorCode:{}", pileSn, connectorCode); // 查询草稿状态的占桩订单 OrderPileOccupy draftOccupyOrder = getDraftOccupyOrder(pileSn, connectorCode); // 关闭草稿订单