修改deviceMessage的字段,并替换XhpcMessage
This commit is contained in:
parent
81f58eb0f4
commit
6e1fcddc6f
@ -8,18 +8,41 @@ import java.util.Date;
|
||||
@Data
|
||||
public class XhpcDeviceMessage {
|
||||
|
||||
/**
|
||||
* 消息ID
|
||||
*/
|
||||
private Long deviceMessageId;
|
||||
|
||||
/**
|
||||
* 设备类型
|
||||
*/
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 设备编码
|
||||
*/
|
||||
private String serialNumber;
|
||||
|
||||
/**
|
||||
* 充电订单号
|
||||
*/
|
||||
private String chargeOrderNo;
|
||||
|
||||
/**
|
||||
* 报文内容
|
||||
*/
|
||||
private String content;
|
||||
|
||||
private String replyContent;
|
||||
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private Integer status;
|
||||
|
||||
/**
|
||||
* 备注描述
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
private String createBy;
|
||||
@ -28,5 +51,4 @@ public class XhpcDeviceMessage {
|
||||
|
||||
private String updateBy;
|
||||
|
||||
private String remark;
|
||||
}
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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;
|
||||
|
||||
@ -22,8 +19,7 @@ import java.util.Map;
|
||||
public class BmsChargerInterruptDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
|
||||
@ -31,11 +27,6 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic {
|
||||
public ServiceResult service(ServiceParameter sp) throws Exception {
|
||||
String remark = "充电桩与 BMS 充电阶段充电机中止报文";
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark(remark);
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
@ -43,6 +34,7 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
return new ServiceResult(false);
|
||||
}
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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;
|
||||
|
||||
@ -22,8 +19,6 @@ import java.util.Map;
|
||||
public class BmsChargingCompletedDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsChargingCompletedDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
@ -32,12 +27,6 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic {
|
||||
public ServiceResult service(ServiceParameter sp) throws Exception {
|
||||
String remark = "充电桩与 BMS 充电结束阶段报文";
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark(remark);
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
@ -45,6 +34,7 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(false);
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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;
|
||||
|
||||
@ -22,8 +19,6 @@ import java.util.Map;
|
||||
public class BmsChargingConfigDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsChargingConfigDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
@ -33,11 +28,6 @@ public class BmsChargingConfigDataLogic implements ServiceLogic {
|
||||
String remark = "充电桩与 BMS 参数配置阶段报文";
|
||||
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark(remark);
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
@ -45,6 +35,7 @@ public class BmsChargingConfigDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(false);
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
@Lazy
|
||||
@ -18,18 +19,23 @@ import java.util.Map;
|
||||
public class BmsChargingDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsChargingDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
|
||||
@Override
|
||||
public ServiceResult service(ServiceParameter sp) throws Exception {
|
||||
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark("充电桩与 BMS 充电过程 BMS 信息");
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
deviceMessage.setSerialNumber(sp.getPileNo());
|
||||
deviceMessage.setRemark("充电桩与 BMS 充电过程 BMS 信息");
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(false);
|
||||
}
|
||||
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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;
|
||||
|
||||
@ -22,8 +19,6 @@ import java.util.Map;
|
||||
public class BmsChargingHandshakeDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsChargingHandshakeDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
@ -33,11 +28,6 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic {
|
||||
String remark = "充电桩与 BMS 充电握手阶段报文";
|
||||
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark(remark);
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
@ -45,6 +35,7 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(false);
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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;
|
||||
|
||||
@ -22,8 +19,7 @@ import java.util.Map;
|
||||
public class BmsErrorDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
|
||||
@ -31,11 +27,6 @@ public class BmsErrorDataLogic implements ServiceLogic {
|
||||
public ServiceResult service(ServiceParameter sp) throws Exception {
|
||||
String remark = "充电桩与 BMS 充电错误报文";
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark(remark);
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
@ -43,6 +34,7 @@ public class BmsErrorDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
return new ServiceResult(false);
|
||||
}
|
||||
|
||||
@ -1,16 +1,13 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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;
|
||||
|
||||
@ -22,8 +19,7 @@ import java.util.Map;
|
||||
public class BmsInterruptDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
|
||||
@ -31,11 +27,6 @@ public class BmsInterruptDataLogic implements ServiceLogic {
|
||||
public ServiceResult service(ServiceParameter sp) throws Exception {
|
||||
String remark = "充电桩与 BMS 充电阶段 BMS 中止报文";
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark(remark);
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
@ -43,6 +34,7 @@ public class BmsInterruptDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(false);
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
package com.xhpc.pp.logic;
|
||||
|
||||
import com.xhpc.mapper.XhpcMessageMapper;
|
||||
import com.xhpc.pp.domain.XhpcMessage;
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
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 javax.annotation.Resource;
|
||||
import java.util.Map;
|
||||
|
||||
@Lazy
|
||||
@ -18,18 +19,23 @@ import java.util.Map;
|
||||
public class BmsReqChargerOutputDataLogic implements ServiceLogic {
|
||||
|
||||
private static final Logger log = LoggerFactory.getLogger(BmsReqChargerOutputDataLogic.class);
|
||||
@Autowired
|
||||
private XhpcMessageMapper xhpcMessageMapper;
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
|
||||
@Override
|
||||
public ServiceResult service(ServiceParameter sp) throws Exception {
|
||||
|
||||
Map<String, Object> req = sp.getParameters();
|
||||
XhpcMessage msg = new XhpcMessage();
|
||||
msg.setContent((String) req.get("hex"));
|
||||
msg.setChargeOrderNo((String) req.get("orderNo"));
|
||||
msg.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出");
|
||||
xhpcMessageMapper.insertItemsBy(msg);
|
||||
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
deviceMessage.setSerialNumber(sp.getPileNo());
|
||||
deviceMessage.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出");
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(false);
|
||||
}
|
||||
|
||||
|
||||
@ -55,7 +55,6 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark(remark);
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setReplyContent(result);
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(result);
|
||||
|
||||
@ -56,7 +56,6 @@ public class RateModelRequestLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark("充电桩计费模型请求");
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setReplyContent(resultStr);
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK);
|
||||
|
||||
@ -72,7 +72,6 @@ public class RateModelValidateLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark("计费模型验证请求");
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setReplyContent(resultStr);
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(HexUtils.toBytes(resultStr), resultCode);
|
||||
|
||||
@ -91,7 +91,6 @@ public class RegisterLogic implements ServiceLogic {
|
||||
deviceMessage.setRemark("充电桩登录认证");
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent((String) req.get("hex"));
|
||||
deviceMessage.setReplyContent(resultStr);
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
|
||||
return new ServiceResult(HexUtils.toBytes(resultStr), resultCode);
|
||||
|
||||
@ -3,9 +3,12 @@ package com.xhpc.pp.server;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.alibaba.nacos.api.exception.NacosException;
|
||||
import com.xhpc.common.api.dto.ChargingStationDto;
|
||||
import com.xhpc.common.enums.StationDeviceEnum;
|
||||
import com.xhpc.pp.domain.ServiceField;
|
||||
import com.xhpc.pp.domain.XhpcDeviceMessage;
|
||||
import com.xhpc.pp.logic.FieldLogic;
|
||||
import com.xhpc.pp.logic.ServiceMainLogic;
|
||||
import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
|
||||
import com.xhpc.pp.tx.ServiceParameter;
|
||||
import com.xhpc.pp.tx.ServiceResult;
|
||||
import com.xhpc.pp.tx.TxException;
|
||||
@ -18,6 +21,7 @@ import org.quickserver.net.server.ClientHandler;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.IOException;
|
||||
import java.util.*;
|
||||
|
||||
@ -49,6 +53,10 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
|
||||
private final ServiceMainLogic servicemainLogic;
|
||||
|
||||
|
||||
@Resource
|
||||
XhpcDeviceMessageMapper deviceMessageMapper;
|
||||
|
||||
|
||||
public ChargingPileBinaryHandler() {
|
||||
|
||||
servicemainLogic = SpringContextHolder.getBean("ServiceMainLogic");
|
||||
@ -115,6 +123,14 @@ public class ChargingPileBinaryHandler implements ClientBinaryHandler {
|
||||
} else {
|
||||
log.debug("server send msg >>>> ({}) |{}|", pileNo, toHex(result.getBinary()));
|
||||
handler.sendClientBinary(result.getBinary());
|
||||
XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
|
||||
deviceMessage.setType(StationDeviceEnum.PILE.getCode());
|
||||
deviceMessage.setSerialNumber(sp.getPileNo());
|
||||
deviceMessage.setRemark("平台下发/回复充电桩");
|
||||
deviceMessage.setStatus(0);
|
||||
deviceMessage.setContent(HexUtils.toString(result.getBinary()));
|
||||
deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
|
||||
deviceMessageMapper.insertByDomain(deviceMessage);
|
||||
}
|
||||
if (SERVICE_HB.equals(serviceName) && OK.equals(resultCode)) {
|
||||
Boolean tcfg = (Boolean) cachePile.get("tcfg");
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
<result property="type" column="type"/>
|
||||
<result property="serialNumber" column="serial_number"/>
|
||||
<result property="content" column="content"/>
|
||||
<result property="replyContent" column="reply_content"/>
|
||||
<result property="chargeOrderNo" column="charge_order_no"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
@ -19,10 +19,10 @@
|
||||
|
||||
<insert id="insertByDomain" parameterType="com.xhpc.pp.domain.XhpcDeviceMessage">
|
||||
insert into xhpc_device_message(
|
||||
<if test="type != null and type != 0">type,</if>
|
||||
<if test="type != null">type,</if>
|
||||
<if test="serialNumber != null and serialNumber != 0">serial_number,</if>
|
||||
<if test="content != null and content != ''">content,</if>
|
||||
<if test="replyContent != null and replyContent != ''">reply_content,</if>
|
||||
<if test="chargeOrderNo != null and chargeOrderNo != ''">charge_order_no,</if>
|
||||
<if test="status != null and status != ''">status,</if>
|
||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||
<if test="remark != null and remark != ''">remark,</if>
|
||||
@ -33,7 +33,7 @@
|
||||
<if test="type != null and type != 0">#{type},</if>
|
||||
<if test="serialNumber != null and serialNumber != 0">#{serialNumber},</if>
|
||||
<if test="content != null and content != ''">#{content},</if>
|
||||
<if test="replyContent != null and replyContent != ''">#{replyContent},</if>
|
||||
<if test="chargeOrderNo != null and chargeOrderNo != ''">#{chargeOrderNo},</if>
|
||||
<if test="status != null and status != ''">#{status},</if>
|
||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||
<if test="remark != null and remark != ''">#{remark},</if>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user