From 2e2ac8b278cabe004dde73d4df38382456d05ddc Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 20 Dec 2021 10:22:41 +0800 Subject: [PATCH] =?UTF-8?q?soc=E8=BE=BE=E5=88=B0=E4=B8=8D=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E4=B8=80=E7=9B=B4=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/common/core/utils/HttpUtils.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/HttpUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/HttpUtils.java index ace04bc9..960b6311 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/HttpUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/xhpc/common/core/utils/HttpUtils.java @@ -84,7 +84,7 @@ public class HttpUtils { connectTimeout).build(); // 初始化httpClient httpClient = getConnection(); - System.out.println("HttpClient inited."); + logger.info("HttpClient inited."); } catch (Exception e) { e.printStackTrace(); } 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 0a478cca..acc1bf92 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 @@ -154,16 +154,15 @@ public class RealtimeDataLogic implements ServiceLogic { } else { Integer stopSoc = (Integer) cacheOrder.get("stopSoc"); if (stopSoc != null && socInt >= stopSoc) { + R r = chargingController.nativeStopCharging(pileNo, gunId, default_version); String alerted = (String) cacheOrder.get("socalerted"); String tel = (String) cacheOrder.get("tel"); if (alerted == null && tel != null) { - R r = chargingController.nativeStopCharging(pileNo, gunId, default_version); if (r.getCode() == 200) { HashMap paramMap = new HashMap<>(); paramMap.put("battery", stopSoc.toString()); paramMap.put("phone", tel); - paramMap.put("content", "【小华充电】尊敬的用户，你的车辆已充电达至设定的SOC(" + stopSoc + "%)" + - "已自动停止充电，请您尽快将车辆挪走以方便他人使用充电桩，谢谢合作。"); + paramMap.put("content", "【小华充电】尊敬的用户，你的车辆已充电达至设定的SOC(" + stopSoc + "%)。"); smsService.sendNotice(paramMap); cacheOrder.put("socalerted", "true"); }