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

charge details..

Browse Source
This commit is contained in:
ZZ 2021-11-16 14:27:10 +08:00
parent 29ccbed11a
commit 360639dc20
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java
View File

@ -1,5 +1,6 @@
package com.xhpc.evcs.api;
import com.xhpc.common.data.redis.CacheRateModel;
import com.xhpc.common.data.redis.CacheRealtimeData;
import com.xhpc.evcs.domain.EtOrderMapping;
import com.xhpc.evcs.dto.ChargeInfoRequest;
@ -22,6 +23,7 @@ import java.io.IOException;
import java.util.Map;
import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS;
import static com.xhpc.evcs.notification.NotificationEquipChargeStatusTask.calculateEm;
@RestController()
public class QueryEquipChargeStatusController {
@ -112,16 +114,9 @@ public class QueryEquipChargeStatusController {
CacheRealtimeData orderLord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord");
Double chargingDegree = Double.valueOf(orderLord.getChargingDegree());
equipChargeStatus.setTotalPower(chargingDegree / 10000);
// ChargeDetails detail = new ChargeDetails();
// detail.setDetailStartTime(equipChargeStatus.getStartTime());
// detail.setDetailEndTime(endTime);
// detail.setDetailSeviceMoney(equipChargeStatus.getSeviceMoney());
// detail.setDetailElecMoney(equipChargeStatus.getElecMoney());
// detail.setDetailPower(equipChargeStatus.getTotalPower());
// ChargeDetails[] details = {detail};
// equipChargeStatus.setChargeDetails(details);
final Long rateModelId = (Long) cacheGunData.get("rateModelId");
final CacheRateModel cacheRateModel = REDIS.getCacheObject("rateModel:" + rateModelId);
calculateEm(equipChargeStatus, cacheRateModel);
CommonResponse response = new CommonResponse();
response.setRet(EvcsConst.RET_SUCC);
response.setData(JSONUtil.toJSONString(equipChargeStatus));

6
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java
View File

@ -92,7 +92,7 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher {
}
}
private void calculateEm(EquipChargeStatus equipChargeStatus, CacheRateModel cacheRateModel) {
public static void calculateEm(EquipChargeStatus equipChargeStatus, CacheRateModel cacheRateModel) {
final Date endTime = DateUtil.string2Date(equipChargeStatus.getEndTime());
final Date startTime = DateUtil.string2Date(equipChargeStatus.getStartTime());
@ -161,8 +161,8 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher {
peek.setDetailPower(BigDecimal.valueOf(peek.getDetailPower()).add(oddp).setScale(2, RoundingMode.HALF_UP).doubleValue());
}
private void calculateCD(CacheRateModel cacheRateModel, String rtf,
BigDecimal timePeriodRatio, BigDecimal tpPower, ChargeDetails cd) {
private static void calculateCD(CacheRateModel cacheRateModel, String rtf,
BigDecimal timePeriodRatio, BigDecimal tpPower, ChargeDetails cd) {
cd.setDetailPower(BigDecimal.valueOf(cd.getDetailPower() + tpPower.multiply(timePeriodRatio).doubleValue()).setScale(2, RoundingMode.HALF_UP).doubleValue());
Integer powerPrice;