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

unify order redis cache key under "order:" name space

Browse Source
This commit is contained in:
ZZ 2021-08-05 17:18:40 +08:00
parent ae526b42ca
commit 87f36b78fd
9 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingDataLogic.java
View File

@ -29,11 +29,12 @@ public class BmsChargingDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
BmsChargingData bmsChargingData = objectMapper.convertValue(req, BmsChargingData.class); BmsChargingData bmsChargingData = objectMapper.convertValue(req, BmsChargingData.class);
String orderNo = bmsChargingData.getOrderNo(); String orderNo = bmsChargingData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
List<BmsChargingData> bmsChargingDataList = (List<BmsChargingData>) cacheOrder.getOrDefault("bmsChargings", new ArrayList<>()); List<BmsChargingData> bmsChargingDataList = (List<BmsChargingData>) cacheOrder.getOrDefault("bmsChargings", new ArrayList<>());
bmsChargingDataList.add(bmsChargingData); bmsChargingDataList.add(bmsChargingData);
cacheOrder.put("bmsChargings", bmsChargingDataList); cacheOrder.put("bmsChargings", bmsChargingDataList);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsErrorDataLogic.java
View File

@ -29,11 +29,12 @@ public class BmsErrorDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
BmsErrorData bmsErrorData = objectMapper.convertValue(req, BmsErrorData.class); BmsErrorData bmsErrorData = objectMapper.convertValue(req, BmsErrorData.class);
String orderNo = bmsErrorData.getOrderNo(); String orderNo = bmsErrorData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
List<BmsErrorData> bmsErrorDataList = (List<BmsErrorData>) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>()); List<BmsErrorData> bmsErrorDataList = (List<BmsErrorData>) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>());
bmsErrorDataList.add(bmsErrorData); bmsErrorDataList.add(bmsErrorData);
cacheOrder.put("bmsErrors", bmsErrorDataList); cacheOrder.put("bmsErrors", bmsErrorDataList);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsInterruptDataLogic.java
View File

@ -27,9 +27,10 @@ public class BmsInterruptDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
BmsInterruptData bmsInterruptData = objectMapper.convertValue(req, BmsInterruptData.class); BmsInterruptData bmsInterruptData = objectMapper.convertValue(req, BmsInterruptData.class);
String orderNo = bmsInterruptData.getOrderNo(); String orderNo = bmsInterruptData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
cacheOrder.put("bmsInterrupt", bmsInterruptData); cacheOrder.put("bmsInterrupt", bmsInterruptData);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsReqChargerOutputDataLogic.java
View File

@ -29,11 +29,12 @@ public class BmsReqChargerOutputDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
BmsReqChargerOutputData bmsReqChargerOutputData = objectMapper.convertValue(req, BmsReqChargerOutputData.class); BmsReqChargerOutputData bmsReqChargerOutputData = objectMapper.convertValue(req, BmsReqChargerOutputData.class);
String orderNo = bmsReqChargerOutputData.getOrderNo(); String orderNo = bmsReqChargerOutputData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
List<BmsReqChargerOutputData> bmsReqChargerOutputDataList = (List<BmsReqChargerOutputData>) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>()); List<BmsReqChargerOutputData> bmsReqChargerOutputDataList = (List<BmsReqChargerOutputData>) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>());
bmsReqChargerOutputDataList.add(bmsReqChargerOutputData); bmsReqChargerOutputDataList.add(bmsReqChargerOutputData);
cacheOrder.put("bmsReqChargerOutputs", bmsReqChargerOutputDataList); cacheOrder.put("bmsReqChargerOutputs", bmsReqChargerOutputDataList);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargerInterruptDataLogic.java
View File

@ -27,9 +27,10 @@ public class ChargerInterruptDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
ChargerInterruptData chargerInterruptData = objectMapper.convertValue(req, ChargerInterruptData.class); ChargerInterruptData chargerInterruptData = objectMapper.convertValue(req, ChargerInterruptData.class);
String orderNo = chargerInterruptData.getOrderNo(); String orderNo = chargerInterruptData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
cacheOrder.put("chargerInterrupt", chargerInterruptData); cacheOrder.put("chargerInterrupt", chargerInterruptData);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java
View File

@ -27,9 +27,10 @@ public class ChargingCompletedDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
ChargingCompletedData chargingCompletedData = objectMapper.convertValue(req, ChargingCompletedData.class); ChargingCompletedData chargingCompletedData = objectMapper.convertValue(req, ChargingCompletedData.class);
String orderNo = chargingCompletedData.getOrderNo(); String orderNo = chargingCompletedData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
cacheOrder.put("completed", chargingCompletedData); cacheOrder.put("completed", chargingCompletedData);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java
View File

@ -27,9 +27,10 @@ public class ChargingConfigDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
ChargingConfigData chargingConfigData = objectMapper.convertValue(req, ChargingConfigData.class); ChargingConfigData chargingConfigData = objectMapper.convertValue(req, ChargingConfigData.class);
String orderNo = chargingConfigData.getOrderNo(); String orderNo = chargingConfigData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
cacheOrder.put("config", chargingConfigData); cacheOrder.put("config", chargingConfigData);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

5
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java
View File

@ -27,9 +27,10 @@ public class ChargingHandshakeDataLogic implements ServiceLogic {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
ChargingHandshakeData chargingHandshakeData = objectMapper.convertValue(req, ChargingHandshakeData.class); ChargingHandshakeData chargingHandshakeData = objectMapper.convertValue(req, ChargingHandshakeData.class);
String orderNo = chargingHandshakeData.getOrderNo(); String orderNo = chargingHandshakeData.getOrderNo();
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderNo); String orderkey = "order:".concat(orderNo);
Map<String, Object> cacheOrder = REDIS.getCacheMap(orderkey);
cacheOrder.put("handshake", chargingHandshakeData); cacheOrder.put("handshake", chargingHandshakeData);
REDIS.setCacheMap(orderNo, cacheOrder); REDIS.setCacheMap(orderkey, cacheOrder);
return new ServiceResult(false); return new ServiceResult(false);
} }

2
xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RealtimeDataLogic.java
View File

@ -43,7 +43,7 @@ public class RealtimeDataLogic implements ServiceLogic {
REDIS.setCacheMap(gunkey, cacheGun); REDIS.setCacheMap(gunkey, cacheGun);
String orderNo = realtimeData.getOrderNo(); String orderNo = realtimeData.getOrderNo();
if (orderNo.equals("00000000000000000000000000000000")) { if (orderNo.equals("00000000000000000000000000000000")) {
// todo // todo tidy logic
String hardwareFault = realtimeData.getHardwareFault(); String hardwareFault = realtimeData.getHardwareFault();
String hfs = toBits(hardwareFault); String hfs = toBits(hardwareFault);
char[] hfcs = hfs.toCharArray(); char[] hfcs = hfs.toCharArray();