diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargerInterruptData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargerInterruptData.java similarity index 96% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargerInterruptData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargerInterruptData.java index 00443dc2..c5d86fb8 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargerInterruptData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargerInterruptData.java @@ -1,6 +1,6 @@ package com.xhpc.common.data.up; -public class ChargerInterruptData extends BaseData { +public class BmsChargerInterruptData extends BaseData { private String orderNo; //交易流水号 private String pileNo; //桩号 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java index aa7fd280..b1927cd4 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java @@ -1,7 +1,7 @@ package com.xhpc.pp.logic; import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.ChargerInterruptData; +import com.xhpc.common.data.up.BmsChargerInterruptData; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; @@ -25,11 +25,11 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic { Map req = sp.getParameters(); ObjectMapper objectMapper = new ObjectMapper(); - ChargerInterruptData chargerInterruptData = objectMapper.convertValue(req, ChargerInterruptData.class); - String orderNo = chargerInterruptData.getOrderNo(); + BmsChargerInterruptData bmsChargerInterruptData = objectMapper.convertValue(req, BmsChargerInterruptData.class); + String orderNo = bmsChargerInterruptData.getOrderNo(); String orderkey = "order:".concat(orderNo); Map cacheOrder = REDIS.getCacheMap(orderkey); - cacheOrder.put("chargerInterrupt", chargerInterruptData); + cacheOrder.put("bmsChargerInterrupt", bmsChargerInterruptData); 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 3a2ac92c..20395d4b 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 @@ -11,6 +11,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Calendar; import java.util.List; import java.util.Map; @@ -26,15 +27,19 @@ public class BmsReqChargerOutputDataLogic implements ServiceLogic { public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); + log.debug("{}", req); + long start = Calendar.getInstance().getTimeInMillis(); ObjectMapper objectMapper = new ObjectMapper(); BmsReqChargerOutputData bmsReqChargerOutputData = objectMapper.convertValue(req, BmsReqChargerOutputData.class); String orderNo = bmsReqChargerOutputData.getOrderNo(); String orderkey = "order:".concat(orderNo); Map cacheOrder = REDIS.getCacheMap(orderkey); - List bmsReqChargerOutputDataList = (List) cacheOrder.getOrDefault("bmsErrors", new ArrayList<>()); + List bmsReqChargerOutputDataList = (List) cacheOrder.getOrDefault( + "bmsErrors", new ArrayList<>()); bmsReqChargerOutputDataList.add(bmsReqChargerOutputData); cacheOrder.put("bmsReqChargerOutputs", bmsReqChargerOutputDataList); REDIS.setCacheMap(orderkey, cacheOrder); + log.debug("{} ms elapsed", Calendar.getInstance().getTimeInMillis() - start); return new ServiceResult(false); }