From f279fb482a5d9cdf348c03691e2ada29a97d011b Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 26 Nov 2021 09:41:45 +0800 Subject: [PATCH] vname issue coursing npe --- .../evcs/notification/NotificationEquipChargeStatusTask.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 2 +- .../java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java index 419262a8..5c6fe9e0 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/notification/NotificationEquipChargeStatusTask.java @@ -74,7 +74,6 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { equipChargeStatus.setVoltageA(HexUtils.reverseHexInt(voltage == null ? "D80E" : voltage) / 10.0); Integer soc = REDIS.getCacheMapValue(orderkey, "endSoc"); equipChargeStatus.setSoc(soc == null ? 0.0 : Double.valueOf(soc.toString())); - equipChargeStatus.setStartTime(cacheGun.get("orderstarttime").toString()); CacheRealtimeData lord = REDIS.getCacheObject(orderkey.concat(".lord")); String lordTime; if (lord != null) { @@ -82,6 +81,7 @@ public class NotificationEquipChargeStatusTask extends CoreDispatcher { } else { lordTime = DateUtil.date2String(Calendar.getInstance().getTime(), DATE_FORMAT_DATE_TIME); } + equipChargeStatus.setStartTime(REDIS.getCacheMapValue(orderkey, "startTime")); equipChargeStatus.setEndTime(lordTime); equipChargeStatus.setChargeModel(3); equipChargeStatus.setTotalPower(REDIS.getCacheMapValue(orderkey, "totalPower")); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java index 6d6638c0..5b4515b6 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java @@ -193,7 +193,7 @@ public class RealtimeDataLogic implements ServiceLogic { cacheOrder.put("abnormal", "1.1");//lord is null log.error("abnormal.1 order[{}]", orderNo); } 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")); cacheOrder.put("orderData", lordAsOd); r = pileOrderService.pileEndOrder(orderNo); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java index 6a7c7e68..7f440a6e 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RemoteStartReplyDataLogic.java @@ -60,10 +60,10 @@ public class RemoteStartReplyDataLogic implements ServiceLogic { Map pushOrder = REDIS.getCacheMap(pushOrderKey); if (HEX_01.equals(remoteStartReplyData.getStartResult())) { 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("orderkey", orderkey); - cacheOrder.put("orderstarttime", orderstarttime); + cacheOrder.put("pileStartTime", orderstarttime); REDIS.setCacheMap(gunkey, cacheGun); REDIS.setCacheMap(orderkey, cacheOrder); pileOrderService.pileStartup(orderNo, 1, "启动充电成功");