修改和并的信息

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java

@@ -8,20 +8,6 @@ import java.util.Date;
 @Data
 public class XhpcDeviceMessage {
 
-<<<<<<< HEAD
-    private Long deviceMessageId;
-
-    private String type;
-
-    private String serialNumber;
-
-    private String content;
-
-    private String replyContent;
-
-    private Integer status;
-
-=======
     /**
      * 消息ID
      */
@@ -57,7 +43,6 @@ public class XhpcDeviceMessage {
      */
     private String remark;
 
->>>>>>> log
     private Date createTime;
 
     private String createBy;
@@ -66,8 +51,4 @@ public class XhpcDeviceMessage {
 
     private String updateBy;
 
-<<<<<<< HEAD
-    private String remark;
-=======
->>>>>>> log
 }

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargerInterruptDataLogic.java

@@ -1,13 +1,7 @@
 package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
-<<<<<<< HEAD
-import com.xhpc.mapper.XhpcMessageMapper;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.domain.XhpcMessage;
-=======
-import com.xhpc.pp.domain.XhpcDeviceMessage;
->>>>>>> log
 import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
@@ -25,12 +19,7 @@ import java.util.Map;
 public class BmsChargerInterruptDataLogic implements ServiceLogic {
 
     private static final Logger log = LoggerFactory.getLogger(BmsChargerInterruptDataLogic.class);
-<<<<<<< HEAD
-    @Autowired
-    private XhpcMessageMapper xhpcMessageMapper;
-=======
 
->>>>>>> log
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
 
@@ -38,25 +27,13 @@ public class BmsChargerInterruptDataLogic implements ServiceLogic {
     public ServiceResult service(ServiceParameter sp) throws Exception {
         String remark = "充电桩与 BMS 充电阶段充电机中止报文";
         Map<String, Object> req = sp.getParameters();
-<<<<<<< HEAD
-        XhpcMessage msg = new XhpcMessage();
-        msg.setContent((String) req.get("hex"));
-        msg.setChargeOrderNo((String) req.get("orderNo"));
-        msg.setRemark(remark);
-        xhpcMessageMapper.insertItemsBy(msg);
-=======
->>>>>>> log
-
         XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
         deviceMessage.setType(StationDeviceEnum.PILE.getCode());
         deviceMessage.setSerialNumber(sp.getPileNo());
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-=======
         deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
         return new ServiceResult(false);
     }

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingCompletedDataLogic.java

@@ -1,13 +1,7 @@
 package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
-<<<<<<< HEAD
-import com.xhpc.mapper.XhpcMessageMapper;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.domain.XhpcMessage;
-=======
-import com.xhpc.pp.domain.XhpcDeviceMessage;
->>>>>>> log
 import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
@@ -29,22 +23,10 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic {
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
 
-    @Resource
-    XhpcDeviceMessageMapper deviceMessageMapper;
-
     @Override
     public ServiceResult service(ServiceParameter sp) throws Exception {
         String remark = "充电桩与 BMS 充电结束阶段报文";
         Map<String, Object> req = sp.getParameters();
-<<<<<<< HEAD
-        XhpcMessage msg = new XhpcMessage();
-        msg.setContent((String) req.get("hex"));
-        msg.setChargeOrderNo((String) req.get("orderNo"));
-        msg.setRemark(remark);
-        xhpcMessageMapper.insertItemsBy(msg);
-
-=======
->>>>>>> log
 
         XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
         deviceMessage.setType(StationDeviceEnum.PILE.getCode());
@@ -52,10 +34,7 @@ public class BmsChargingCompletedDataLogic implements ServiceLogic {
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-=======
         deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(false);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingConfigDataLogic.java

@@ -1,13 +1,7 @@
 package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
-<<<<<<< HEAD
-import com.xhpc.mapper.XhpcMessageMapper;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.domain.XhpcMessage;
-=======
-import com.xhpc.pp.domain.XhpcDeviceMessage;
->>>>>>> log
 import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
@@ -29,22 +23,11 @@ public class BmsChargingConfigDataLogic implements ServiceLogic {
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
 
-    @Resource
-    XhpcDeviceMessageMapper deviceMessageMapper;
-
     @Override
     public ServiceResult service(ServiceParameter sp) throws Exception {
         String remark  = "充电桩与 BMS 参数配置阶段报文";
 
         Map<String, Object> req = sp.getParameters();
-<<<<<<< HEAD
-        XhpcMessage msg = new XhpcMessage();
-        msg.setContent((String) req.get("hex"));
-        msg.setChargeOrderNo((String) req.get("orderNo"));
-        msg.setRemark(remark);
-        xhpcMessageMapper.insertItemsBy(msg);
-=======
->>>>>>> log
         
         XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
         deviceMessage.setType(StationDeviceEnum.PILE.getCode());
@@ -52,10 +35,7 @@ public class BmsChargingConfigDataLogic implements ServiceLogic {
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-=======
         deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(false);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/BmsChargingHandshakeDataLogic.java

@@ -1,13 +1,7 @@
 package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
-<<<<<<< HEAD
-import com.xhpc.mapper.XhpcMessageMapper;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.domain.XhpcMessage;
-=======
-import com.xhpc.pp.domain.XhpcDeviceMessage;
->>>>>>> log
 import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
@@ -29,22 +23,11 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic {
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
 
-    @Resource
-    XhpcDeviceMessageMapper deviceMessageMapper;
-
     @Override
     public ServiceResult service(ServiceParameter sp) throws Exception {
         String remark = "充电桩与 BMS 充电握手阶段报文";
 
         Map<String, Object> req = sp.getParameters();
-<<<<<<< HEAD
-        XhpcMessage msg = new XhpcMessage();
-        msg.setContent((String) req.get("hex"));
-        msg.setChargeOrderNo((String) req.get("orderNo"));
-        msg.setRemark(remark);
-        xhpcMessageMapper.insertItemsBy(msg);
-=======
->>>>>>> log
 
         XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
         deviceMessage.setType(StationDeviceEnum.PILE.getCode());
@@ -52,10 +35,7 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic {
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-=======
         deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(false);

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

@@ -1,13 +1,7 @@
 package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
-<<<<<<< HEAD
-import com.xhpc.mapper.XhpcMessageMapper;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.domain.XhpcMessage;
-=======
-import com.xhpc.pp.domain.XhpcDeviceMessage;
->>>>>>> log
 import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
@@ -25,12 +19,7 @@ import java.util.Map;
 public class BmsErrorDataLogic implements ServiceLogic {
 
     private static final Logger log = LoggerFactory.getLogger(BmsErrorDataLogic.class);
-<<<<<<< HEAD
-    @Autowired
-    private XhpcMessageMapper xhpcMessageMapper;
-=======
 
->>>>>>> log
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
 
@@ -38,14 +27,6 @@ public class BmsErrorDataLogic implements ServiceLogic {
     public ServiceResult service(ServiceParameter sp) throws Exception {
         String remark = "充电桩与 BMS 充电错误报文";
         Map<String, Object> req = sp.getParameters();
-<<<<<<< HEAD
-        XhpcMessage msg = new XhpcMessage();
-        msg.setContent((String) req.get("hex"));
-        msg.setChargeOrderNo((String) req.get("orderNo"));
-        msg.setRemark(remark);
-        xhpcMessageMapper.insertItemsBy(msg);
-=======
->>>>>>> log
 
         XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
         deviceMessage.setType(StationDeviceEnum.PILE.getCode());
@@ -53,10 +34,8 @@ public class BmsErrorDataLogic implements ServiceLogic {
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-=======
         deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
->>>>>>> log
+
         deviceMessageMapper.insertByDomain(deviceMessage);
         return new ServiceResult(false);
     }

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

@@ -1,13 +1,7 @@
 package com.xhpc.pp.logic;
 
 import com.xhpc.common.enums.StationDeviceEnum;
-<<<<<<< HEAD
-import com.xhpc.mapper.XhpcMessageMapper;
 import com.xhpc.pp.domain.XhpcDeviceMessage;
-import com.xhpc.pp.domain.XhpcMessage;
-=======
-import com.xhpc.pp.domain.XhpcDeviceMessage;
->>>>>>> log
 import com.xhpc.pp.mapper.XhpcDeviceMessageMapper;
 import com.xhpc.pp.tx.ServiceParameter;
 import com.xhpc.pp.tx.ServiceResult;
@@ -25,12 +19,7 @@ import java.util.Map;
 public class BmsInterruptDataLogic implements ServiceLogic {
 
     private static final Logger log = LoggerFactory.getLogger(BmsInterruptDataLogic.class);
-<<<<<<< HEAD
-    @Autowired
-    private XhpcMessageMapper xhpcMessageMapper;
-=======
 
->>>>>>> log
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
 
@@ -38,14 +27,6 @@ public class BmsInterruptDataLogic implements ServiceLogic {
     public ServiceResult service(ServiceParameter sp) throws Exception {
         String remark = "充电桩与 BMS 充电阶段 BMS 中止报文";
         Map<String, Object> req = sp.getParameters();
-<<<<<<< HEAD
-        XhpcMessage msg = new XhpcMessage();
-        msg.setContent((String) req.get("hex"));
-        msg.setChargeOrderNo((String) req.get("orderNo"));
-        msg.setRemark(remark);
-        xhpcMessageMapper.insertItemsBy(msg);
-=======
->>>>>>> log
 
         XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
         deviceMessage.setType(StationDeviceEnum.PILE.getCode());
@@ -53,10 +34,8 @@ public class BmsInterruptDataLogic implements ServiceLogic {
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-=======
         deviceMessage.setChargeOrderNo((String) req.get("orderNo"));
->>>>>>> log
+
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(false);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java

@@ -55,10 +55,6 @@ public class RateModelConfigReplyDataLogic implements ServiceLogic {
         deviceMessage.setRemark(remark);
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-        deviceMessage.setReplyContent(result);
-=======
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(result);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java

@@ -56,10 +56,6 @@ public class RateModelRequestLogic implements ServiceLogic {
         deviceMessage.setRemark("充电桩计费模型请求");
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-        deviceMessage.setReplyContent(resultStr);
-=======
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(HexUtils.toBytes(resultStr), ServiceResult.OK);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java

@@ -72,10 +72,6 @@ public class RateModelValidateLogic implements ServiceLogic {
         deviceMessage.setRemark("计费模型验证请求");
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-        deviceMessage.setReplyContent(resultStr);
-=======
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(HexUtils.toBytes(resultStr), resultCode);

xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java

@@ -91,10 +91,6 @@ public class RegisterLogic implements ServiceLogic {
         deviceMessage.setRemark("充电桩登录认证");
         deviceMessage.setStatus(0);
         deviceMessage.setContent((String) req.get("hex"));
-<<<<<<< HEAD
-        deviceMessage.setReplyContent(resultStr);
-=======
->>>>>>> log
         deviceMessageMapper.insertByDomain(deviceMessage);
 
         return new ServiceResult(HexUtils.toBytes(resultStr), resultCode);

xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml

@@ -8,11 +8,7 @@
         <result property="type" column="type"/>
         <result property="serialNumber" column="serial_number"/>
         <result property="content" column="content"/>
-<<<<<<< HEAD
-        <result property="replyContent" column="reply_content"/>
-=======
         <result property="chargeOrderNo" column="charge_order_no"/>
->>>>>>> log
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="createBy" column="create_by"/>
@@ -23,17 +19,11 @@
 
     <insert id="insertByDomain" parameterType="com.xhpc.pp.domain.XhpcDeviceMessage">
         insert into xhpc_device_message(
-<<<<<<< HEAD
-        <if test="type != null and type != 0">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="type != null">type,</if>
         <if test="serialNumber != null and serialNumber != 0">serial_number,</if>
         <if test="content != null and content != ''">content,</if>
         <if test="chargeOrderNo != null and chargeOrderNo != ''">charge_order_no,</if>
->>>>>>> log
         <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>
@@ -44,11 +34,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>
-<<<<<<< HEAD
-        <if test="replyContent != null and replyContent != ''">#{replyContent},</if>
-=======
         <if test="chargeOrderNo != null and chargeOrderNo != ''">#{chargeOrderNo},</if>
->>>>>>> log
         <if test="status != null and status != ''">#{status},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         <if test="remark != null and remark != ''">#{remark},</if>