autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 地锁逻辑修改

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-09-09 15:05:37 +08:00
parent 147a5df11b
commit c3c072d2a7
4 changed files with 129 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
jsowell-netty/src/main/java/com/jsowell/netty/handler/GroundLockDataUploadHandler.java
View File

@@ -1,5 +1,6 @@
package com.jsowell.netty.handler;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.core.domain.ykc.GroundLockData;
@@ -89,24 +90,6 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
byte[] waitingUseByteArr = BytesUtil.copyBytes(msgBody, 12, 4);
String waitingUse = BytesUtil.bcd2Str(waitingUseByteArr);
// 封装到对象中
GroundLockData data = GroundLockData.builder()
.pileSn(pileSn)
.connectorCode(connectorCode)
.parkingLockStatus(parkingLockStatus)
.parkingStatus(parkingStatus)
.groundLockElectric(groundLockElectric)
.alarmStatus(alarmStatus)
.time(DateUtils.getTime())
.build();
// 地锁信息放缓存中 缓存10分钟
String redisKey = CacheConstants.GROUND_LOCK_DATA + pileSn + connectorCode;
redisCache.setCacheObject(redisKey, data, CacheConstants.cache_expire_time_10m);
log.info("[===地锁数据上送===] result: 桩编码:{}, 枪号:{}, 车位锁状态:{}, 车位状态:{}, 地锁电量状态:{}, 报警状态:{}",
pileSn, connectorCode, parkingLockStatus, parkingStatus, groundLockElectric, alarmStatus);
if (StringUtils.equals(parkingLockStatus, "55")) {
log.info("0x61地锁数据，车位锁状态:升锁到位状态");
if (StringUtils.equals(parkingStatus, "00")) {
@@ -126,6 +109,24 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
} else {
log.info("0x61地锁数据，车位锁状态:未到位状态");
}
// 封装到对象中
GroundLockData data = GroundLockData.builder()
.pileSn(pileSn)
.connectorCode(connectorCode)
.parkingLockStatus(parkingLockStatus)
.parkingStatus(parkingStatus)
.groundLockElectric(groundLockElectric)
.alarmStatus(alarmStatus)
.time(DateUtils.getTime())
.build();
// 地锁信息放缓存中 缓存10分钟
String redisKey = CacheConstants.GROUND_LOCK_DATA + pileSn + connectorCode;
redisCache.setCacheObject(redisKey, data, CacheConstants.cache_expire_time_10m);
log.info("[===地锁数据上送===] result: 桩编码:{}, 枪号:{}, 车位锁状态:{}, 车位状态:{}, 地锁电量状态:{}, 报警状态:{}",
pileSn, connectorCode, parkingLockStatus, parkingStatus, groundLockElectric, alarmStatus);
return null;
}
@@ -143,7 +144,7 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
orderInfo.setStartTime(DateUtils.getNowDate());
orderInfo.setPayStatus(OccupyOrderPayStatusEnum.UN_PAY.getCode());
// 修改数据库
log.info("降锁成功，修改订单状态");
log.info("降锁成功，修改订单状态:{}", JSON.toJSONString(orderInfo));
orderPileOccupyService.updateByPrimaryKeySelective(orderInfo);
}
}
@@ -152,6 +153,17 @@ public class GroundLockDataUploadHandler extends AbstractHandler{
* 升锁成功时调用
*/
private void raiseTheGroundLock(String pileSn, String connectorCode) {
orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode);
// 两种情况 1是没有停车，地锁自动升起；2是停车完成地锁升起
boolean stopFlag = true;
if (stopFlag) {
// 停止占桩订单计时
orderPileOccupyService.stopOccupyPileOrder(pileSn, connectorCode);
} else {
// 关闭占桩订单
orderPileOccupyService.closeOccupyPileOrder(pileSn, connectorCode);
}
}
}