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

修改query_equip_charge_status接口数据来源

Browse Source
This commit is contained in:
wen 2021-11-11 10:56:08 +08:00
parent c180ec4256
commit 89540ca832
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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