From 2423204e12e551f7911355c4d60a650a14273bf6 Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 12 Oct 2021 16:20:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=B7=E5=A7=8Bsoc=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xhpc/pp/logic/OrderDataLogic.java | 2 +- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java index 247e17d5..e192d7b4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/OrderDataLogic.java @@ -42,7 +42,7 @@ public class OrderDataLogic implements ServiceLogic { Map cacheOrder = REDIS.getCacheMap(orderkey); CacheOrderData cacheOrderData = translate(orderData); Integer startSoc = (Integer) cacheOrder.get("startSoc"); - cacheOrderData.setStartSoc(startSoc); + cacheOrderData.setStartSoc(startSoc == null ? 0 : startSoc); cacheOrderData.setEndSoc((Integer) cacheOrder.get("endSoc")); cacheOrderData.setStatus(1); cacheOrderData.setCreateTime(DateUtil.now()); 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 e5493f01..2e38dc9f 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 @@ -124,7 +124,7 @@ public class RealtimeDataLogic implements ServiceLogic { REDIS.setCacheObject(lord, cacheRealtimeData); realtimeDataList.add(cacheRealtimeData); Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); - if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt); + if (cacheStartSoc == null && socInt != 0) cacheOrder.put("startSoc", socInt); cacheOrder.put("endSoc", socInt); // cacheOrder.put("em", realtimeData.()); //todo 实时时段明细数据是否由桩直接上传? cacheOrder.put("rbalance", balance);