From ea4136d9f625aa1ed95e656b97025a481ce964ae Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Mon, 25 Oct 2021 14:58:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/pp/controller/ChargingController.java | 14 ++++++++------
 .../com/xhpc/pp/controller/PileController.java     |  9 +++++----
 2 files changed, 13 insertions(+), 10 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 77b50194..c7d62f97 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
@@ -182,7 +182,7 @@ public class ChargingController {
 
         String pileNo = refreshBalanceData.getPileNo();
         String gunkey = "gun:".concat(pileNo).concat(refreshBalanceData.getGunId());
-        if (CacheDataUtils.hori(gunkey)) return R.fail("余额下发失败,请重试");
+        if (CacheDataUtils.hori(gunkey)) return R.fail("余额下发失败");
         String skey = gunkey.concat(".seqhex");
         String seq = seqHex(skey);
         String refreshBalanceMsg = "6818".concat(seq).concat("0042").concat(pileNo).concat(refreshBalanceData.getGunId())
@@ -191,22 +191,24 @@ public class ChargingController {
         refreshBalanceMsg = refreshBalanceMsg.concat(CRCCalculator.calcCrc(refreshBalanceMsg));
         ClientHandler handler = getHandler(pileNo);
         R<Object> r;
-        if (handler != null) {
+        if (handler != null) { //todo 余额下发重试机制
             if (!handler.isOpen()) {
                 log.error("[{}]({}) connection lost", handler.getName(), pileNo);
                 removeHandler(pileNo);
-                r = R.fail("充电桩连接已断开");
+                r = R.fail("网络连接断开,无法刷新桩上余额");
             } else {
                 try {
                     log.info("native refresh balance >>> {}", refreshBalanceMsg);
                     handler.sendClientBinary(HexUtils.toBytes(refreshBalanceMsg));
-                    r = R.ok("余额更新已下发");
+                    r = R.ok("余额刷新指令已下发");
                 } catch (IOException e) {
-                    r = R.fail("余额更新下发失败:".concat(e.getMessage()));
+                    log.error("订单[{}]余额下发失败,终端离线故障:{}", refreshBalanceData.getOrderNo(), e.getMessage());
+                    r = R.fail("网络故障,余额刷新失败");
                 }
             }
         } else {
-            r = R.fail("余额更新下发失败,充电桩离线");
+            log.error("订单[{}]余额下发失败,充电桩离线", refreshBalanceData.getOrderNo());
+            r = R.fail("余额刷新失败");
         }
         return r;
     }
diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java
index f275a4b1..4d4d3c96 100644
--- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java
+++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java
@@ -78,15 +78,16 @@ public class PileController {
                 try {
                     log.info("[{}] - server send msg >>>> ({}) |{}|", handler.getName(), pileNo, msg);
                     handler.sendClientBinary(HexUtils.toBytes(msg));
-                    r = R.ok(null, "费率模型已下发,请再次启动充电");
+                    r = R.ok(null, "网络延迟,请重试");
                 } catch (IOException e) {
-                    log.error("send message failed. " + e.getMessage(), e);
+                    log.error("费率模型下发失败[{}]:".concat(e.getMessage()).concat(".无法启动充电"), pileNo);
                     removeHandler(pileNo);
-                    r = R.fail("费率模型下发失败:".concat(e.getMessage()).concat(".无法启动充电"));
+                    r = R.fail("电桩网络通信失败,请重试");
                 }
             }
         } else {
-            r = R.fail("费率模型下发失败,充电桩离线");
+            log.error("费率模型下发失败[{}].无法启动充电", pileNo);
+            r = R.fail("启动失败,请稍后重试");
         }
         return r;
     }