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

Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2025-08-29 14:22:24 +08:00
parent a6b8a02370 9877a08840
commit 564d313164
17 changed files with 179 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/EBikeSendCommandServiceImpl.java
View File

@@ -125,9 +125,15 @@ public class EBikeSendCommandServiceImpl implements EBikeSendCommandService {
message.setForceAutoStopWhenFull(1);
message.setFullChargePower(0);
message.setMaxFullChargePowerCheckTime(0);
byte[] response = this.send(message);
log.info("电单车发送停止充电指令response:{}", BytesUtil.binary(response, 16));
return new ChargingOperationResponse(response);
// send方法有可能抛异常，所以这里用try-catch, 避免异常
try {
byte[] response = this.send(message);
log.info("电单车发送停止充电指令response:{}", BytesUtil.binary(response, 16));
return new ChargingOperationResponse(response);
} catch (Exception e) {
log.error("电单车发送停止充电指令异常:{}", e.getMessage());
return null;
}
}
/**

24
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -687,26 +687,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (CollectionUtils.isEmpty(orderList)) {
return;
}
// long currentTimeMillis = System.currentTimeMillis();
for (OrderBasicInfo orderBasicInfo : orderList) {
// 判断支付成功时间距当前时间是否大于15分钟
// long time;
// String startType = orderBasicInfo.getStartType();
// // 立即启动的订单使用支付时间判断，预约充电的订单使用预约时间判断
// if (StringUtils.equals(StartTypeEnum.NOW.getValue(), startType)) {
// Date payTime = orderBasicInfo.getPayTime();
// time = payTime == null ? 0L : payTime.getTime();
// } else {
// Date reservedStartTime = orderBasicInfo.getReservedStartTime();
// time = reservedStartTime == null ? 0L : reservedStartTime.getTime();
// }
//
// if (currentTimeMillis - time < 1000 * 60 * 15) {
// logger.info("orderCode:{}, currentTimeMillis:{} - time:{} = {}, 支付成功时间距当前时间小于15分钟, 暂不执行退款",
// orderBasicInfo.getOrderCode(), currentTimeMillis, time, currentTimeMillis - time);
// continue;
// }
for (OrderBasicInfo orderBasicInfo : orderList) {
// 判断支付成功时间距当前时间是否大于15分钟
String startType = orderBasicInfo.getStartType();
// 立即启动的订单使用支付时间判断，预约充电的订单使用预约时间判断
@@ -2943,14 +2925,14 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return resultList;
}
String pileConnectorCode = transactionCode.substring(0, 16); // 汽车桩
String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode;
String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode; // 查缓存
// 拿到所有数据
Map<Object, Object> map = redisCache.hmget(redisKey);
// logger.debug("查redis中的实时数据, pileConnectorCode:{}, transactionCode:{}, map:{}", pileConnectorCode, transactionCode, map);
if (map == null || map.isEmpty()) {
// 按照电单车重新查
pileConnectorCode = transactionCode.substring(0, 10); // 电单车车桩
redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode;
redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode; // 查缓存
map = redisCache.hmget(redisKey);
// logger.debug("按照电单车重新查, pileConnectorCode:{}, transactionCode:{}, map:{}", pileConnectorCode, transactionCode, map);
}

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderMonitorDataServiceImpl.java
View File

@@ -69,9 +69,6 @@ public class OrderMonitorDataServiceImpl implements OrderMonitorDataService {
if (orderMonitorData != null) {
// 放缓存
setRedisCache(orderMonitorData);
// redisCache.setCacheObject(redisKey, orderMonitorData, CacheConstants.cache_expire_time_12h);
// String redisKey2 = CacheConstants.ORDER_MONITOR_DATA_BY_TRANSACTION_CODE + orderMonitorData.getTransactionCode();
// redisCache.setCacheObject(redisKey2, orderMonitorData, CacheConstants.cache_expire_time_12h);
}
}
return orderMonitorData;
@@ -86,9 +83,6 @@ public class OrderMonitorDataServiceImpl implements OrderMonitorDataService {
if (orderMonitorData != null) {
// 放缓存
setRedisCache(orderMonitorData);
// redisCache.setCacheObject(redisKey, orderMonitorData, CacheConstants.cache_expire_time_12h);
// String redisKey2 = CacheConstants.ORDER_MONITOR_DATA_BY_ORDER_CODE + orderMonitorData.getOrderCode();
// redisCache.setCacheObject(redisKey2, orderMonitorData, CacheConstants.cache_expire_time_12h);
}
}
return orderMonitorData;
@@ -100,9 +94,9 @@ public class OrderMonitorDataServiceImpl implements OrderMonitorDataService {
return;
}
String redisKey = CacheConstants.ORDER_MONITOR_DATA_BY_ORDER_CODE + orderMonitorData.getOrderCode();
redisCache.setCacheObject(redisKey, orderMonitorData, CacheConstants.cache_expire_time_12h);
redisCache.setCacheObject(redisKey, orderMonitorData, CacheConstants.cache_expire_time_30m);
String redisKey2 = CacheConstants.ORDER_MONITOR_DATA_BY_TRANSACTION_CODE + orderMonitorData.getTransactionCode();
redisCache.setCacheObject(redisKey2, orderMonitorData, CacheConstants.cache_expire_time_12h);
redisCache.setCacheObject(redisKey2, orderMonitorData, CacheConstants.cache_expire_time_30m);
}
}

4
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
View File

@@ -641,7 +641,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
}
// 保存到redis
String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + realTimeMonitorData.getPileConnectorCode() + "_" + realTimeMonitorData.getTransactionCode();
String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + realTimeMonitorData.getPileConnectorCode() + "_" + realTimeMonitorData.getTransactionCode(); // 放缓存
// 设置接收到实时数据的时间
Date now = new Date();
@@ -657,8 +657,6 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
// 设置过期时间
try {
redisCache.expire(redisKey, CacheConstants.cache_expire_time_30d);
// if (redisCache.getExpire(redisKey) < 0) {
// }
} catch (Exception e) {
log.info("设置过期时间error", e);
}

2
jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java
View File

@@ -878,7 +878,7 @@ public abstract class AbstractProgramLogic implements InitializingBean {
if (insert > 0) {
// 删除redis中缓存
String pileConnectorCode = transactionCode.substring(0, 16);
String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode;
String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode; // 删缓存
redisCache.deleteObject(redisKey);
}
} catch (Exception e) {