yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missing fees

Browse Source
This commit is contained in:
ZZ 2021-11-17 16:26:27 +08:00
parent 930996ad2a
commit e2ffbefd33
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStationsInfoController.java
View File

@ -135,7 +135,7 @@ public class QueryStationsInfoController {
//运营商id //运营商id
String operatorIdEvcs = xhpcChargingStation.getOperatorIdEvcs(); String operatorIdEvcs = xhpcChargingStation.getOperatorIdEvcs();
chargingStationDto.setOperatorId(operatorIdEvcs == null ? "MA6DFCTD5" chargingStationDto.setOperatorId(operatorIdEvcs == null ? "MA6DFCTD5"
: operatorIdEvcs.length() == 9 ? operatorId : operatorIdEvcs.substring(9, 19)); : operatorIdEvcs.length() == 9 ? operatorId : operatorIdEvcs.substring(9, 18));
//详细地址 //详细地址
chargingStationDto.setAddress(xhpcChargingStation.getAddress()); chargingStationDto.setAddress(xhpcChargingStation.getAddress());
//充电站省直辖区编码 //充电站省直辖区编码
@ -162,8 +162,10 @@ public class QueryStationsInfoController {
stationInfo.setStationLat(chargingStationDto.getLat()); stationInfo.setStationLat(chargingStationDto.getLat());
stationInfo.setConstruction(chargingStationDto.getConstruction()); stationInfo.setConstruction(chargingStationDto.getConstruction());
String[] fees = getFees(chargingStationDto.getRateModelId()); String[] fees = getFees(chargingStationDto.getRateModelId());
stationInfo.setElectricityFee(fees[0]); if (fees != null) {
stationInfo.setServiceFee(fees[1]); stationInfo.setElectricityFee(fees[0]);
stationInfo.setServiceFee(fees[1]);
}
//获取该充电站的下的所有充电设备列表 //获取该充电站的下的所有充电设备列表
Set<String> piles = chargingStationDto.getPiles(); Set<String> piles = chargingStationDto.getPiles();
List<EquipmentInfo> equipmentInfos = getEquipmentInfos(piles); List<EquipmentInfo> equipmentInfos = getEquipmentInfos(piles);
@ -182,6 +184,10 @@ public class QueryStationsInfoController {
private String[] getFees(Long rateModelId) { private String[] getFees(Long rateModelId) {
CacheRateModel cacheRateModel = REDIS.getCacheObject("rateModel:".concat(rateModelId.toString())); CacheRateModel cacheRateModel = REDIS.getCacheObject("rateModel:".concat(rateModelId.toString()));
if (cacheRateModel == null) {
log.error("rate model missing: {}", rateModelId);
return null;
}
if (cacheRateModel.getPp() != null) { if (cacheRateModel.getPp() != null) {
return cacheRateModel.getPp(); return cacheRateModel.getPp();
} }