From 4db9f3ed7707611a8fa93af034bbecdd682bfa9d Mon Sep 17 00:00:00 2001 From: ZZ Date: Sat, 18 Sep 2021 10:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BA=A4=E6=B5=81=E6=A1=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 4 ++-- .../src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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 ab7489c5..9b1bce10 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 @@ -117,8 +117,8 @@ public class RealtimeDataLogic implements ServiceLogic { REDIS.setCacheObject(lord, cacheRealtimeData); realtimeDataList.add(cacheRealtimeData); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); - if (cacheStartSoc == null && socInt != 0) cacheOrder.put("startSoc", socInt); - if (socInt != 0) cacheOrder.put("endSoc", socInt); + if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt); + cacheOrder.put("endSoc", socInt); cacheOrder.put("rbalance", balance); cacheOrder.put("remainingTime", tr); cacheOrder.put("status", statusplain); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java index f0ee5a3e..f03a9cc8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ServiceMainLogic.java @@ -34,6 +34,7 @@ public class ServiceMainLogic { } catch (TxException e) { log.error("服务请求失败：错误码[" + e.getReturnCode() + "],错误：{" + e.getMessage() + "}"); // saveErrorLog(sp, e); + try { terminateTransaction(sp); result = new ServiceResult(e.getReturnCode(), e.getMessage());