Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

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;
+
     /**
      * 充电桩编号
      */

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分钟

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) {