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

修改提示信息

Browse Source
This commit is contained in:
ZZ 2021-10-25 14:58:05 +08:00
parent c14543c9ae
commit ea4136d9f6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/ChargingController.java
View File

@ -182,7 +182,7 @@ public class ChargingController {
String pileNo = refreshBalanceData.getPileNo(); String pileNo = refreshBalanceData.getPileNo();
String gunkey = "gun:".concat(pileNo).concat(refreshBalanceData.getGunId()); 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 skey = gunkey.concat(".seqhex");
String seq = seqHex(skey); String seq = seqHex(skey);
String refreshBalanceMsg = "6818".concat(seq).concat("0042").concat(pileNo).concat(refreshBalanceData.getGunId()) 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)); refreshBalanceMsg = refreshBalanceMsg.concat(CRCCalculator.calcCrc(refreshBalanceMsg));
ClientHandler handler = getHandler(pileNo); ClientHandler handler = getHandler(pileNo);
R<Object> r; R<Object> r;
if (handler != null) { if (handler != null) { //todo 余额下发重试机制
if (!handler.isOpen()) { if (!handler.isOpen()) {
log.error("[{}]({}) connection lost", handler.getName(), pileNo); log.error("[{}]({}) connection lost", handler.getName(), pileNo);
removeHandler(pileNo); removeHandler(pileNo);
r = R.fail("充电桩连接已断开"); r = R.fail("网络连接断开,无法刷新桩上余额");
} else { } else {
try { try {
log.info("native refresh balance >>> {}", refreshBalanceMsg); log.info("native refresh balance >>> {}", refreshBalanceMsg);
handler.sendClientBinary(HexUtils.toBytes(refreshBalanceMsg)); handler.sendClientBinary(HexUtils.toBytes(refreshBalanceMsg));
r = R.ok("余额更新已下发"); r = R.ok("余额刷新指令已下发");
} catch (IOException e) { } catch (IOException e) {
r = R.fail("余额更新下发失败:".concat(e.getMessage())); log.error("订单[{}]余额下发失败,终端离线故障:{}", refreshBalanceData.getOrderNo(), e.getMessage());
r = R.fail("网络故障,余额刷新失败");
} }
} }
} else { } else {
r = R.fail("余额更新下发失败,充电桩离线"); log.error("订单[{}]余额下发失败,充电桩离线", refreshBalanceData.getOrderNo());
r = R.fail("余额刷新失败");
} }
return r; return r;
} }

9
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/controller/PileController.java
View File

@ -78,15 +78,16 @@ public class PileController {
try { try {
log.info("[{}] - server send msg >>>> ({}) |{}|", handler.getName(), pileNo, msg); log.info("[{}] - server send msg >>>> ({}) |{}|", handler.getName(), pileNo, msg);
handler.sendClientBinary(HexUtils.toBytes(msg)); handler.sendClientBinary(HexUtils.toBytes(msg));
r = R.ok(null, "费率模型已下发,请再次启动充电"); r = R.ok(null, "网络延迟,请重试");
} catch (IOException e) { } catch (IOException e) {
log.error("send message failed. " + e.getMessage(), e); log.error("费率模型下发失败[{}]:".concat(e.getMessage()).concat(".无法启动充电"), pileNo);
removeHandler(pileNo); removeHandler(pileNo);
r = R.fail("费率模型下发失败:".concat(e.getMessage()).concat(".无法启动充电")); r = R.fail("电桩网络通信失败,请重试");
} }
} }
} else { } else {
r = R.fail("费率模型下发失败,充电桩离线"); log.error("费率模型下发失败[{}].无法启动充电", pileNo);
r = R.fail("启动失败,请稍后重试");
} }
return r; return r;
} }