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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2024-02-28 14:47:47 +08:00
parent 3e6ef0cb3a
commit 32a5daeeac
6 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -341,4 +341,14 @@ public interface OrderBasicInfoMapper {
* @return 订单列表
*/
List<OrderBasicInfo> queryOrderListByGroupCode(String groupCode);
/**
* 查询新电途订单列表
* @param merchantId
* @param stationId
* @param startDate
* @param endDate
* @return
*/
List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate);
}

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

@@ -96,8 +96,8 @@ public class PileRemoteService {
// 获取充电桩0x13数据，校验交易流水号是否一致
String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + pileSn + connectorCode;
String redisResult = redisCache.getCacheObject(pileIsChargingKey);
if (!StringUtils.equals(redisResult, transactionCode)) {
log.info("发送远程停止充电指令-充电桩枪口编号:{}, 获取到正在充电中的交易流水号:{}与入参交易流水号:{}不一致", pileSn + connectorCode, redisResult, transactionCode);
if (StringUtils.isNotBlank(redisResult) && !StringUtils.equals(redisResult, transactionCode)) {
log.info("发送远程停止充电指令-充电桩枪口编号:{}, 获取到正在充电中的交易流水号:{}, 与入参交易流水号:{}不一致", pileSn + connectorCode, redisResult, transactionCode);
return;
}
StopChargingCommand command = StopChargingCommand.builder()

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

@@ -3636,6 +3636,12 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderBasicInfoMapper.queryOrderListByGroupCode(groupCode);
}
/**
* 查询新电途订单
*/
public List<OrderBasicInfo> queryXDTOrderList(String merchantId, String stationId, String startDate, String endDate) {
return orderBasicInfoMapper.queryXDTOrderList(merchantId, stationId, startDate, endDate);
}
}

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

@@ -570,7 +570,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
// 把充电桩正在充电中的状态存到redis
String pileIsChargingKey = CacheConstants.PILE_IS_CHARGING + realTimeMonitorData.getPileConnectorCode();
redisCache.setCacheObject(pileIsChargingKey, realTimeMonitorData.getTransactionCode(), 12);
redisCache.setCacheObject(pileIsChargingKey, realTimeMonitorData.getTransactionCode(), 20);
}
@Override