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

实时分段计费结束时间以最后一帧实时数据为准

Browse Source
This commit is contained in:
ZZ 2021-11-22 12:14:51 +08:00
parent 8597fb09ab
commit 769ef78891
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@ import com.xhpc.evcs.encryption.EvcsConst;
import com.xhpc.evcs.http.ServerInternalException; import com.xhpc.evcs.http.ServerInternalException;
import com.xhpc.evcs.jpa.OrderMappingRepository; import com.xhpc.evcs.jpa.OrderMappingRepository;
import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository; import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository;
import com.xhpc.evcs.utils.DateUtil;
import com.xhpc.evcs.utils.JSONUtil; import com.xhpc.evcs.utils.JSONUtil;
import com.xhpc.pp.utils.HexUtils; import com.xhpc.pp.utils.HexUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -107,11 +106,11 @@ public class QueryEquipChargeStatusController {
String startTime = (String) order.get("startTime"); String startTime = (String) order.get("startTime");
equipChargeStatus.setStartTime(startTime); equipChargeStatus.setStartTime(startTime);
//本次采样时间 直接new一个当前时间的Date就可以了 //本次采样时间 直接new一个当前时间的Date就可以了
equipChargeStatus.setEndTime(DateUtil.getYyyyMmDdHhMmSs()); CacheRealtimeData lord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord");
equipChargeStatus.setEndTime(lord.getCreateTime());
Integer chargeModel = (Integer) order.get("chargeModel"); Integer chargeModel = (Integer) order.get("chargeModel");
equipChargeStatus.setChargeModel(chargeModel == null ? 0 : chargeModel); equipChargeStatus.setChargeModel(chargeModel == null ? 0 : chargeModel);
//累计充电量 //累计充电量
CacheRealtimeData lord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord");
Double chargingDegree = Double.valueOf(lord.getChargingDegree() == null ? 0 : lord.getChargingDegree()); Double chargingDegree = Double.valueOf(lord.getChargingDegree() == null ? 0 : lord.getChargingDegree());
equipChargeStatus.setTotalPower(chargingDegree / 10000); equipChargeStatus.setTotalPower(chargingDegree / 10000);
//总金额 //总金额