From cc1fd3fafd35f27a6e09227c3f38ef4cc90fcceb Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 8 Sep 2023 15:48:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9C=B0=E9=94=81=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/common/core/domain/ykc/GroundLockData.java | 5 +++++ .../jsowell/netty/handler/GroundLockDataUploadHandler.java | 1 + .../pile/service/impl/OrderPileOccupyServiceImpl.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/GroundLockData.java b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/GroundLockData.java index 4c882eb0f..9e903b818 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/GroundLockData.java +++ b/jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/GroundLockData.java @@ -13,6 +13,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Builder public class GroundLockData { + /** + * 时间 + */ + private String time; + /** * 充电桩编号 */ 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 909116237..44cb13a8f 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 @@ -97,6 +97,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{ .parkingStatus(parkingStatus) .groundLockElectric(groundLockElectric) .alarmStatus(alarmStatus) + .time(DateUtils.getTime()) .build(); // 地锁信息放缓存中 缓存10分钟 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 ae705d449..9ca21c801 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 @@ -196,6 +196,8 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { */ @Override public void stopOccupyPileOrder(String pileSn, String connectorCode) { + // 两种情况 1是没有停车，地锁自动升起；2是停车完成地锁升起 + // 根据充电站sn和枪口号，查询占桩中的占桩订单 OrderPileOccupy orderPileOccupy = getOccupiedOrder(pileSn, connectorCode); if (orderPileOccupy == null) {