From 2f8d0c3a901849627813b7d2c20a586911f65541 Mon Sep 17 00:00:00 2001 From: ZZ Date: Fri, 27 Aug 2021 14:10:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E7=A1=AE=E8=AE=B0=E5=BD=95=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E7=BB=93=E6=9D=9FSOC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/pp/controller/ChargingController.java | 2 ++ .../main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java index 27a8974d..f5adf28c 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java @@ -232,6 +232,8 @@ public class ChargingController { cacheOrder.put("balance", balance); cacheOrder.put("tel", startChargingData.getTel()); cacheOrder.put("stopSoc", startChargingData.getSoc()); + cacheOrder.put("startSoc", 0); + cacheOrder.put("endSoc", 0); REDIS.setCacheMap(orderkey, cacheOrder); cacheGun.put("orderstarttime", DateUtil.format(Calendar.getInstance().getTime(), NORM_DATETIME_FORMAT)); cacheGun.put("orderstoptime", null); 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 5d8be542..36ba74cf 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 @@ -106,8 +106,8 @@ public class RealtimeDataLogic implements ServiceLogic { String lord = orderkey.concat(".lord"); REDIS.setCacheObject(lord, cacheRealtimeData); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); - if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt); - cacheOrder.put("endSoc", socInt); + if (cacheStartSoc == 0 && socInt != 0) cacheOrder.put("startSoc", socInt); + if (socInt != 0) cacheOrder.put("endSoc", socInt); cacheOrder.put("remainingTime", tr); cacheOrder.put("status", statusplain); cacheOrder.put("realtimeDataList", realtimeDataList); @@ -120,7 +120,9 @@ public class RealtimeDataLogic implements ServiceLogic { if (alerted == null && tel != null) { R r = chargingController.nativeStopCharging(pileNo, gunId, default_version); if (r.getCode() == 200) { - smsService.sendNotice(tel, "【小华充电】尊敬的用户，你的车辆已充电达至设定的SOC(".concat(stopSoc.toString()).concat("%)已自动停止充电，请您尽快将车辆挪走以方便他人使用充电桩，谢谢合作。")); + smsService.sendNotice(tel, "【小华充电】尊敬的用户，你的车辆已充电达至设定的SOC(" + .concat(stopSoc.toString()) + .concat("%)已自动停止充电，请您尽快将车辆挪走以方便他人使用充电桩，谢谢合作。")); cacheOrder.put("socalerted", "true"); REDIS.setCacheMap(orderkey, cacheOrder); }