From f1b70257a52aca73ee4929db692d7c2db68054a4 Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 14 Sep 2021 11:48:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/api/dto/ChargingStationDto.java | 11 ++++++ ...ata.java => BmsChargingCompletedData.java} | 2 +- ...igData.java => BmsChargingConfigData.java} | 2 +- .../java/com/xhpc/pp/domain/XhpcMessage.java | 16 +++++--- .../logic/BmsChargerInterruptDataLogic.java | 21 +++++------ .../logic/BmsChargingCompletedDataLogic.java | 36 ++++++++++++++++++ .../pp/logic/BmsChargingConfigDataLogic.java | 36 ++++++++++++++++++ .../xhpc/pp/logic/BmsChargingDataLogic.java | 25 +++++-------- .../logic/BmsChargingHandshakeDataLogic.java | 36 ++++++++++++++++++ .../com/xhpc/pp/logic/BmsErrorDataLogic.java | 25 +++++-------- .../xhpc/pp/logic/BmsInterruptDataLogic.java | 21 +++++------ .../logic/BmsReqChargerOutputDataLogic.java | 30 +++++---------- .../pp/logic/ChargingCompletedDataLogic.java | 37 ------------------- .../pp/logic/ChargingConfigDataLogic.java | 37 ------------------- .../pp/logic/ChargingHandshakeDataLogic.java | 37 ------------------- 15 files changed, 182 insertions(+), 190 deletions(-) rename xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/{ChargingCompletedData.java => BmsChargingCompletedData.java} (98%) rename xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/{ChargingConfigData.java => BmsChargingConfigData.java} (98%) create mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java create mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java create mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java delete mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java delete mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java delete mode 100644 xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java index 1bf54c0a..34666cfc 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/dto/ChargingStationDto.java @@ -7,6 +7,7 @@ public class ChargingStationDto { private Long stationId; private Set piles; private Long rateModelId; + private String operatorId; public Long getStationId() { @@ -38,4 +39,14 @@ public class ChargingStationDto { this.rateModelId = rateModelId; } + public String getOperatorId() { + + return operatorId; + } + + public void setOperatorId(String operatorId) { + + this.operatorId = operatorId; + } + } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingCompletedData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingCompletedData.java similarity index 98% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingCompletedData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingCompletedData.java index bb9ea489..b560d504 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingCompletedData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingCompletedData.java @@ -1,7 +1,7 @@ package com.xhpc.common.data.up; //充电桩与 BMS 充电结束阶段报文 -public class ChargingCompletedData extends BaseData { +public class BmsChargingCompletedData extends BaseData { private String orderNo; //交易流水号 private String pileNo; //桩号 diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingConfigData.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingConfigData.java similarity index 98% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingConfigData.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingConfigData.java index 3ff6de3d..41e38b6a 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/ChargingConfigData.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/data/up/BmsChargingConfigData.java @@ -1,7 +1,7 @@ package com.xhpc.common.data.up; //充电桩与 BMS 参数配置阶段报文 -public class ChargingConfigData extends BaseData { +public class BmsChargingConfigData extends BaseData { private String orderNo; //交易流水号 private String pileNo; //桩号 diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcMessage.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcMessage.java index d0ec3f99..fe557682 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcMessage.java +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcMessage.java @@ -10,31 +10,37 @@ import com.xhpc.common.core.web.domain.BaseEntity; public class XhpcMessage extends BaseEntity { private Long messageId; - private Long chargeOrderId; + private String chargeOrderNo; private String content; private Integer status; public Long getMessageId() { + return messageId; } public void setMessageId(Long messageId) { + this.messageId = messageId; } - public Long getChargeOrderId() { - return chargeOrderId; + public String getChargeOrderNo() { + + return chargeOrderNo; } - public void setChargeOrderId(Long chargeOrderId) { - this.chargeOrderId = chargeOrderId; + public void setChargeOrderNo(String chargeOrderNo) { + + this.chargeOrderNo = chargeOrderNo; } public String getContent() { + return content; } public void setContent(String content) { + this.content = content; } 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 b1927cd4..f7649973 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,36 +1,35 @@ package com.xhpc.pp.logic; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.BmsChargerInterruptData; +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.util.Map; -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - @Lazy @Component("BmsChargerInterruptDataLogic") public class BmsChargerInterruptDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - BmsChargerInterruptData bmsChargerInterruptData = objectMapper.convertValue(req, BmsChargerInterruptData.class); - String orderNo = bmsChargerInterruptData.getOrderNo(); - String orderkey = "order:".concat(orderNo); - Map cacheOrder = REDIS.getCacheMap(orderkey); - cacheOrder.put("bmsChargerInterrupt", bmsChargerInterruptData); - REDIS.setCacheMap(orderkey, cacheOrder); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电阶段充电机中止报文"); + xhpcMessageMapper.insertItemsBy(msg); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java new file mode 100644 index 00000000..a38e2589 --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java @@ -0,0 +1,36 @@ +package com.xhpc.pp.logic; + +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; +import com.xhpc.pp.tx.ServiceParameter; +import com.xhpc.pp.tx.ServiceResult; +import com.xhpc.pp.tx.logic.ServiceLogic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Lazy +@Component("BmsChargingCompletedDataLogic") +public class BmsChargingCompletedDataLogic implements ServiceLogic { + + private static Logger log = LoggerFactory.getLogger(BmsChargingCompletedDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; + + @Override + public ServiceResult service(ServiceParameter sp) throws Exception { + + Map req = sp.getParameters(); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电结束阶段报文"); + xhpcMessageMapper.insertItemsBy(msg); + return new ServiceResult(false); + } + +} diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java new file mode 100644 index 00000000..255692bb --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java @@ -0,0 +1,36 @@ +package com.xhpc.pp.logic; + +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; +import com.xhpc.pp.tx.ServiceParameter; +import com.xhpc.pp.tx.ServiceResult; +import com.xhpc.pp.tx.logic.ServiceLogic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Lazy +@Component("BmsChargingConfigDataLogic") +public class BmsChargingConfigDataLogic implements ServiceLogic { + + private static Logger log = LoggerFactory.getLogger(BmsChargingConfigDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; + + @Override + public ServiceResult service(ServiceParameter sp) throws Exception { + + Map req = sp.getParameters(); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 参数配置阶段报文"); + xhpcMessageMapper.insertItemsBy(msg); + return new ServiceResult(false); + } + +} 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 dd2b1712..014bb4c4 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 @@ -1,40 +1,35 @@ package com.xhpc.pp.logic; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.BmsChargingData; +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; import java.util.Map; -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - @Lazy @Component("BmsChargingDataLogic") public class BmsChargingDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(BmsChargingDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - BmsChargingData bmsChargingData = objectMapper.convertValue(req, BmsChargingData.class); - String orderNo = bmsChargingData.getOrderNo(); - String orderkey = "order:".concat(orderNo); - Map cacheOrder = REDIS.getCacheMap(orderkey); - List bmsChargingDataList = (List) cacheOrder.getOrDefault("bmsChargingData", new ArrayList<>()); - bmsChargingDataList.add(bmsChargingData); - cacheOrder.put("bmsChargingData", bmsChargingDataList); - REDIS.setCacheMap(orderkey, cacheOrder); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电过程 BMS 信息"); + xhpcMessageMapper.insertItemsBy(msg); return new ServiceResult(false); } diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java new file mode 100644 index 00000000..4afde8e3 --- /dev/null +++ b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java @@ -0,0 +1,36 @@ +package com.xhpc.pp.logic; + +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; +import com.xhpc.pp.tx.ServiceParameter; +import com.xhpc.pp.tx.ServiceResult; +import com.xhpc.pp.tx.logic.ServiceLogic; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Lazy +@Component("BmsChargingHandshakeDataLogic") +public class BmsChargingHandshakeDataLogic implements ServiceLogic { + + private static Logger log = LoggerFactory.getLogger(BmsChargingHandshakeDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; + + @Override + public ServiceResult service(ServiceParameter sp) throws Exception { + + Map req = sp.getParameters(); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电握手阶段报文"); + xhpcMessageMapper.insertItemsBy(msg); + 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 f519358e..fab4cd3c 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 @@ -1,40 +1,35 @@ package com.xhpc.pp.logic; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.BmsErrorData; +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; import java.util.Map; -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - @Lazy @Component("BmsErrorDataLogic") public class BmsErrorDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - BmsErrorData bmsErrorData = objectMapper.convertValue(req, BmsErrorData.class); - String orderNo = bmsErrorData.getOrderNo(); - 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(orderkey, cacheOrder); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电错误报文"); + xhpcMessageMapper.insertItemsBy(msg); 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 67577895..96e597d4 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 @@ -1,36 +1,35 @@ package com.xhpc.pp.logic; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.BmsInterruptData; +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import java.util.Map; -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - @Lazy @Component("BmsInterruptDataLogic") public class BmsInterruptDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; @Override public ServiceResult service(ServiceParameter sp) throws Exception { Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - BmsInterruptData bmsInterruptData = objectMapper.convertValue(req, BmsInterruptData.class); - String orderNo = bmsInterruptData.getOrderNo(); - String orderkey = "order:".concat(orderNo); - Map cacheOrder = REDIS.getCacheMap(orderkey); - cacheOrder.put("bmsInterrupt", bmsInterruptData); - REDIS.setCacheMap(orderkey, cacheOrder); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电阶段 BMS 中止报文"); + xhpcMessageMapper.insertItemsBy(msg); 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 20395d4b..1127205a 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 @@ -1,45 +1,35 @@ package com.xhpc.pp.logic; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.BmsReqChargerOutputData; +import com.xhpc.pp.domain.XhpcMessage; +import com.xhpc.pp.mapper.XhpcMessageMapper; import com.xhpc.pp.tx.ServiceParameter; import com.xhpc.pp.tx.ServiceResult; import com.xhpc.pp.tx.logic.ServiceLogic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; 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; -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - @Lazy @Component("BmsReqChargerOutputDataLogic") public class BmsReqChargerOutputDataLogic implements ServiceLogic { private static Logger log = LoggerFactory.getLogger(BmsReqChargerOutputDataLogic.class); + @Autowired + private XhpcMessageMapper xhpcMessageMapper; @Override 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<>()); - bmsReqChargerOutputDataList.add(bmsReqChargerOutputData); - cacheOrder.put("bmsReqChargerOutputs", bmsReqChargerOutputDataList); - REDIS.setCacheMap(orderkey, cacheOrder); - log.debug("{} ms elapsed", Calendar.getInstance().getTimeInMillis() - start); + XhpcMessage msg = new XhpcMessage(); + msg.setContent((String) req.get("hex")); + msg.setChargeOrderNo((String) req.get("orderNo")); + msg.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出"); + xhpcMessageMapper.insertItemsBy(msg); 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 deleted file mode 100644 index 9ec6dfb3..00000000 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingCompletedDataLogic.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xhpc.pp.logic; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.ChargingCompletedData; -import com.xhpc.pp.tx.ServiceParameter; -import com.xhpc.pp.tx.ServiceResult; -import com.xhpc.pp.tx.logic.ServiceLogic; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Component; - -import java.util.Map; - -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - -@Lazy -@Component("BmsChargingCompletedDataLogic") -public class ChargingCompletedDataLogic implements ServiceLogic { - - private static Logger log = LoggerFactory.getLogger(ChargingCompletedDataLogic.class); - - @Override - public ServiceResult service(ServiceParameter sp) throws Exception { - - Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - ChargingCompletedData chargingCompletedData = objectMapper.convertValue(req, ChargingCompletedData.class); - String orderNo = chargingCompletedData.getOrderNo(); - String orderkey = "order:".concat(orderNo); - Map cacheOrder = REDIS.getCacheMap(orderkey); - cacheOrder.put("completed", chargingCompletedData); - 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 deleted file mode 100644 index 3ee01dd4..00000000 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingConfigDataLogic.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xhpc.pp.logic; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.ChargingConfigData; -import com.xhpc.pp.tx.ServiceParameter; -import com.xhpc.pp.tx.ServiceResult; -import com.xhpc.pp.tx.logic.ServiceLogic; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Component; - -import java.util.Map; - -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - -@Lazy -@Component("BmsChargingConfigDataLogic") -public class ChargingConfigDataLogic implements ServiceLogic { - - private static Logger log = LoggerFactory.getLogger(ChargingConfigDataLogic.class); - - @Override - public ServiceResult service(ServiceParameter sp) throws Exception { - - Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - ChargingConfigData chargingConfigData = objectMapper.convertValue(req, ChargingConfigData.class); - String orderNo = chargingConfigData.getOrderNo(); - String orderkey = "order:".concat(orderNo); - Map cacheOrder = REDIS.getCacheMap(orderkey); - cacheOrder.put("config", chargingConfigData); - 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 deleted file mode 100644 index 97e4d6c1..00000000 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/ChargingHandshakeDataLogic.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.xhpc.pp.logic; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xhpc.common.data.up.ChargingHandshakeData; -import com.xhpc.pp.tx.ServiceParameter; -import com.xhpc.pp.tx.ServiceResult; -import com.xhpc.pp.tx.logic.ServiceLogic; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Component; - -import java.util.Map; - -import static com.xhpc.common.data.redis.StaticBeanUtil.REDIS; - -@Lazy -@Component("BmsChargingHandshakeDataLogic") -public class ChargingHandshakeDataLogic implements ServiceLogic { - - private static Logger log = LoggerFactory.getLogger(ChargingHandshakeDataLogic.class); - - @Override - public ServiceResult service(ServiceParameter sp) throws Exception { - - Map req = sp.getParameters(); - ObjectMapper objectMapper = new ObjectMapper(); - ChargingHandshakeData chargingHandshakeData = objectMapper.convertValue(req, ChargingHandshakeData.class); - String orderNo = chargingHandshakeData.getOrderNo(); - String orderkey = "order:".concat(orderNo); - Map cacheOrder = REDIS.getCacheMap(orderkey); - cacheOrder.put("handshake", chargingHandshakeData); - REDIS.setCacheMap(orderkey, cacheOrder); - return new ServiceResult(false); - } - -}