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

vname issue coursing npe

Browse Source
This commit is contained in:
ZZ 2021-11-26 09:41:45 +08:00
parent db87434480
commit f279fb482a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,6 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher {
equipChargeStatus.setVoltageA(HexUtils.reverseHexInt(voltage == null ? "D80E" : voltage) / 10.0); equipChargeStatus.setVoltageA(HexUtils.reverseHexInt(voltage == null ? "D80E" : voltage) / 10.0);
Integer soc = REDIS.getCacheMapValue(orderkey, "endSoc"); Integer soc = REDIS.getCacheMapValue(orderkey, "endSoc");
equipChargeStatus.setSoc(soc == null ? 0.0 : Double.valueOf(soc.toString())); equipChargeStatus.setSoc(soc == null ? 0.0 : Double.valueOf(soc.toString()));
equipChargeStatus.setStartTime(cacheGun.get("orderstarttime").toString());
CacheRealtimeData lord = REDIS.getCacheObject(orderkey.concat(".lord")); CacheRealtimeData lord = REDIS.getCacheObject(orderkey.concat(".lord"));
String lordTime; String lordTime;
if (lord != null) { if (lord != null) {
@ -82,6 +81,7 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher {
} else { } else {
lordTime = DateUtil.date2String(Calendar.getInstance().getTime(), DATE_FORMAT_DATE_TIME); lordTime = DateUtil.date2String(Calendar.getInstance().getTime(), DATE_FORMAT_DATE_TIME);
} }
equipChargeStatus.setStartTime(REDIS.getCacheMapValue(orderkey, "startTime"));
equipChargeStatus.setEndTime(lordTime); equipChargeStatus.setEndTime(lordTime);
equipChargeStatus.setChargeModel(3); equipChargeStatus.setChargeModel(3);
equipChargeStatus.setTotalPower(REDIS.getCacheMapValue(orderkey, "totalPower")); equipChargeStatus.setTotalPower(REDIS.getCacheMapValue(orderkey, "totalPower"));

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -193,7 +193,7 @@ public class RealtimeDataLogic implements ServiceLogic {
cacheOrder.put("abnormal", "1.1");//lord is null cacheOrder.put("abnormal", "1.1");//lord is null
log.error("abnormal.1 order[{}]", orderNo); log.error("abnormal.1 order[{}]", orderNo);
} else { } else {
CacheOrderData lordAsOd = new CacheOrderData(cacheRData, (String) cacheOrder.get("orderstarttime"), CacheOrderData lordAsOd = new CacheOrderData(cacheRData, (String) cacheOrder.get("pileStartTime"),
(Integer) cacheOrder.get("startSoc"), (Integer) cacheOrder.get("stopSoc")); (Integer) cacheOrder.get("startSoc"), (Integer) cacheOrder.get("stopSoc"));
cacheOrder.put("orderData", lordAsOd); cacheOrder.put("orderData", lordAsOd);
r = pileOrderService.pileEndOrder(orderNo); r = pileOrderService.pileEndOrder(orderNo);

4
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java
View File

@ -60,10 +60,10 @@ public class RemoteStartReplyDataLogic implements ServiceLogic {
Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey); Map<String, Object> pushOrder = REDIS.getCacheMap(pushOrderKey);
if (HEX_01.equals(remoteStartReplyData.getStartResult())) { if (HEX_01.equals(remoteStartReplyData.getStartResult())) {
final String orderstarttime = DateUtil.format(Calendar.getInstance().getTime(), NORM_DATETIME_FORMAT); final String orderstarttime = DateUtil.format(Calendar.getInstance().getTime(), NORM_DATETIME_FORMAT);
cacheGun.put("orderstarttime", orderstarttime); cacheGun.put("pileStartTime", orderstarttime);
cacheGun.put("orderstoptime", null); cacheGun.put("orderstoptime", null);
cacheGun.put("orderkey", orderkey); cacheGun.put("orderkey", orderkey);
cacheOrder.put("orderstarttime", orderstarttime); cacheOrder.put("pileStartTime", orderstarttime);
REDIS.setCacheMap(gunkey, cacheGun); REDIS.setCacheMap(gunkey, cacheGun);
REDIS.setCacheMap(orderkey, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
pileOrderService.pileStartup(orderNo, 1, "启动充电成功"); pileOrderService.pileStartup(orderNo, 1, "启动充电成功");