From 87f36b78fdaf76e493255e39cdf73f24894a430c Mon Sep 17 00:00:00 2001 From: ZZ Date: Thu, 5 Aug 2021 17:18:40 +0800 Subject: [PATCH] unify order redis cache key under "order:" name space --- .../main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java | 5 +++-- .../src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java | 5 +++-- .../main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java | 5 +++-- .../java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java | 5 +++-- .../java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java | 5 +++-- .../java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java | 5 +++-- .../main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java | 5 +++-- .../java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java | 5 +++-- .../src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java | 2 +- 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java index 412541a8..3954f4f9 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java @@ -29,11 +29,12 @@ public class BmsChargingDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); BmsChargingData bmsChargingData = objectMapper.convertValue(req, BmsChargingData.class); String orderNo = bmsChargingData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); List bmsChargingDataList = (List) cacheOrder.getOrDefault("bmsChargings", new ArrayList<>()); bmsChargingDataList.add(bmsChargingData); cacheOrder.put("bmsChargings", bmsChargingDataList); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java index 71b3219c..a8a8b670 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java @@ -29,11 +29,12 @@ public class BmsErrorDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); BmsErrorData bmsErrorData = objectMapper.convertValue(req, BmsErrorData.class); String orderNo = bmsErrorData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); List bmsErrorDataList = (List) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>()); bmsErrorDataList.add(bmsErrorData); cacheOrder.put("bmsErrors", bmsErrorDataList); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java index 0c68111c..8f9277e4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java @@ -27,9 +27,10 @@ public class BmsInterruptDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); BmsInterruptData bmsInterruptData = objectMapper.convertValue(req, BmsInterruptData.class); String orderNo = bmsInterruptData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); cacheOrder.put("bmsInterrupt", bmsInterruptData); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java index 9ece6ed7..6ffd9999 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java @@ -29,11 +29,12 @@ public class BmsReqChargerOutputDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); BmsReqChargerOutputData bmsReqChargerOutputData = objectMapper.convertValue(req, BmsReqChargerOutputData.class); String orderNo = bmsReqChargerOutputData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); List bmsReqChargerOutputDataList = (List) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>()); bmsReqChargerOutputDataList.add(bmsReqChargerOutputData); cacheOrder.put("bmsReqChargerOutputs", bmsReqChargerOutputDataList); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java index 6cd7c255..44f795f4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java @@ -27,9 +27,10 @@ public class ChargerInterruptDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); ChargerInterruptData chargerInterruptData = objectMapper.convertValue(req, ChargerInterruptData.class); String orderNo = chargerInterruptData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); cacheOrder.put("chargerInterrupt", chargerInterruptData); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java index 79c0463b..2bf90e4d 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java @@ -27,9 +27,10 @@ public class ChargingCompletedDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); ChargingCompletedData chargingCompletedData = objectMapper.convertValue(req, ChargingCompletedData.class); String orderNo = chargingCompletedData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); cacheOrder.put("completed", chargingCompletedData); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java index 84dfd617..7f2d9ac8 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java @@ -27,9 +27,10 @@ public class ChargingConfigDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); ChargingConfigData chargingConfigData = objectMapper.convertValue(req, ChargingConfigData.class); String orderNo = chargingConfigData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); cacheOrder.put("config", chargingConfigData); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java index c449aa02..aacc7597 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java @@ -27,9 +27,10 @@ public class ChargingHandshakeDataLogic implements ServiceLogic { ObjectMapper objectMapper = new ObjectMapper(); ChargingHandshakeData chargingHandshakeData = objectMapper.convertValue(req, ChargingHandshakeData.class); String orderNo = chargingHandshakeData.getOrderNo(); - Map cacheOrder = REDIS.getCacheMap(orderNo); + String orderkey = "order:".concat(orderNo); + Map cacheOrder = REDIS.getCacheMap(orderkey); cacheOrder.put("handshake", chargingHandshakeData); - REDIS.setCacheMap(orderNo, cacheOrder); + REDIS.setCacheMap(orderkey, cacheOrder); return new ServiceResult(false); } 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 83b66869..1ca0e89d 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 @@ -43,7 +43,7 @@ public class RealtimeDataLogic implements ServiceLogic { REDIS.setCacheMap(gunkey, cacheGun); String orderNo = realtimeData.getOrderNo(); if (orderNo.equals("00000000000000000000000000000000")) { - // todo + // todo tidy logic String hardwareFault = realtimeData.getHardwareFault(); String hfs = toBits(hardwareFault); char[] hfcs = hfs.toCharArray();