From a21d1351567ec253474a656ae57349de31228484 Mon Sep 17 00:00:00 2001 From: ZZ Date: Mon, 27 Sep 2021 17:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=E6=98=A0=E5=B0=84;?= =?UTF-8?q?=E6=97=B6=E6=AE=B5=E6=98=8E=E7=BB=86=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xhpc/common/data/redis/StaticBeanUtil.java | 9 +++++++++ .../main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java index 7a264612..4b92a781 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/redis/StaticBeanUtil.java @@ -51,4 +51,13 @@ public class StaticBeanUtil { return upperCode; } + public synchronized static String seq18Dec(String key) { + + String upperCode = ""; + RedisAtomicLong counter = new RedisAtomicLong(key, REDIS.redisTemplate.getConnectionFactory()); + long result = counter.incrementAndGet(); + upperCode = String.format("%018d", result); + return upperCode; + } + } 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 9b1bce10..a9cbe150 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 @@ -64,6 +64,8 @@ public class RealtimeDataLogic implements ServiceLogic { String statusplain = stable[statusInt]; cacheGun.put("pileGunStatus", pvgstable[Integer.parseInt(realtimeData.getPileGunStatus())]); cacheGun.put("vehicleGunStatus", pvgstable[Integer.parseInt(realtimeData.getVehicleGunStatus())]); + cacheGun.put("voltage", realtimeData.getWorkingVoltage()); + cacheGun.put("current", realtimeData.getWorkingCurrent()); String hardwareFault = realtimeData.getHardwareFault(); String hfs = toBits(hardwareFault); char[] hfcs = hfs.toCharArray(); @@ -119,6 +121,8 @@ public class RealtimeDataLogic implements ServiceLogic { Integer cacheStartSoc = (Integer) cacheOrder.get("startSoc"); if (cacheStartSoc == null) cacheOrder.put("startSoc", socInt); cacheOrder.put("endSoc", socInt); + cacheOrder.put("tp", realtimeData.getChargingDegree()); +// cacheOrder.put("em", realtimeData.()); //todo 实时时段明细数据是否由桩直接上传? cacheOrder.put("rbalance", balance); cacheOrder.put("remainingTime", tr); cacheOrder.put("status", statusplain);