From 89540ca8325210d7dd77dbf69761c3638984faa3 Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Thu, 11 Nov 2021 10:56:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9query=5Fequip=5Fcharge=5Fstat?=
 =?UTF-8?q?us=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/QueryEquipChargeStatusController.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 02812dec..64d7b214 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
@@ -1,6 +1,6 @@
 package com.xhpc.evcs.api;
 
-import com.xhpc.common.data.redis.CacheOrderData;
+import com.xhpc.common.data.redis.CacheRealtimeData;
 import com.xhpc.evcs.domain.EtOrderMapping;
 import com.xhpc.evcs.dto.ChargeInfoRequest;
 import com.xhpc.evcs.dto.CommonRequest;
@@ -68,7 +68,7 @@ public class QueryEquipChargeStatusController {
         equipChargeStatus.setStartChargeSeqStat(startChargeSeqStat);
         //充电设备接口编码
         String connectorId = internalOrderNum.substring(0, 16);
-        CacheOrderData cacheOrderData = (CacheOrderData) order.get("orderData");
+//        CacheOrderData cacheOrderData = (CacheOrderData) order.get("orderData");
         //充电设备接口状态
         Map<String, Object> cacheGunData = REDIS.getCacheMap("gun:" + connectorId);
         String gunStatus = (String) cacheGunData.get("status");
@@ -90,25 +90,25 @@ public class QueryEquipChargeStatusController {
         equipChargeStatus.setConnectorStatus(connectorStatus);
         //A相电流
         String current = (String) cacheGunData.get("current");
-        Double currentA = Double.valueOf(current); // todo 16-base/10
+        Double currentA = Integer.parseInt(current, 16) / 10.0;
         equipChargeStatus.setCurrentA(currentA);
         //A相电压
         String voltage = (String) cacheGunData.get("voltage");
-        Double voltageA = Double.valueOf(voltage);
+        Double voltageA = Integer.parseInt(voltage, 16) / 10.0;
         equipChargeStatus.setVoltageA(voltageA);
         //电池剩余电量
-        Integer endSoc = cacheOrderData.getEndSoc();
+        Integer endSoc = (Integer) order.get("endSoc");
         Double soc = Double.valueOf(endSoc);
         equipChargeStatus.setVoltageA(soc);
         //开始充电时间
-        String startTime = cacheOrderData.getStartTime();
+        String startTime = (String) order.get("startTime");
         equipChargeStatus.setStartTime(startTime);
         //本次采样时间 直接new一个当前时间的Date就可以了
         equipChargeStatus.setEndTime(DateUtil.getNowDateStr());
         //累计充电量
-        double totalPowerQuantity = (double) cacheOrderData.getTotalPowerQuantity();
-        double totalPower = totalPowerQuantity / 10000;
-        equipChargeStatus.setTotalPower(totalPower);
+        CacheRealtimeData orderLord = REDIS.getCacheObject("order:" + internalOrderNum + ".lord");
+        Double chargingDegree = Double.valueOf(orderLord.getChargingDegree());
+        equipChargeStatus.setTotalPower(chargingDegree);
 
 //        ChargeDetails detail = new ChargeDetails();
 //        detail.setDetailStartTime(equipChargeStatus.getStartTime());