From 769ef788914b5550233d6bede6548a8bbbbbca1b Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 22 Nov 2021 12:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=88=86=E6=AE=B5=E8=AE=A1?= =?UTF-8?q?=E8=B4=B9=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E4=BB=A5=E6=9C=80?= =?UTF-8?q?=E5=90=8E=E4=B8=80=E5=B8=A7=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/evcs/api/QueryEquipChargeStatusController.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java index a598c52c..300ae18e 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryEquipChargeStatusController.java @@ -11,7 +11,6 @@ import com.xhpc.evcs.encryption.EvcsConst; import com.xhpc.evcs.http.ServerInternalException; import com.xhpc.evcs.jpa.OrderMappingRepository; import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository; -import com.xhpc.evcs.utils.DateUtil; import com.xhpc.evcs.utils.JSONUtil; import com.xhpc.pp.utils.HexUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -107,11 +106,11 @@ public class QueryEquipChargeStatusController { String startTime = (String) order.get("startTime"); equipChargeStatus.setStartTime(startTime); //本次采样时间 直接new一个当前时间的Date就可以了 - equipChargeStatus.setEndTime(DateUtil.getYyyyMmDdHhMmSs()); + CacheRealtimeData lord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord"); + equipChargeStatus.setEndTime(lord.getCreateTime()); Integer chargeModel = (Integer) order.get("chargeModel"); equipChargeStatus.setChargeModel(chargeModel == null ? 0 : chargeModel); //累计充电量 - CacheRealtimeData lord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord"); Double chargingDegree = Double.valueOf(lord.getChargingDegree() == null ? 0 : lord.getChargingDegree()); equipChargeStatus.setTotalPower(chargingDegree / 10000); //总金额