From ef99658e6ce7425d81ab158a3b2e2b2bb216bd6c Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Thu, 13 Jan 2022 09:48:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E5=B9=B6=E7=9A=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/pp/domain/XhpcDeviceMessage.java | 19 --------------- .../logic/BmsChargerInterruptDataLogic.java | 23 ------------------- .../logic/BmsChargingCompletedDataLogic.java | 21 ----------------- .../pp/logic/BmsChargingConfigDataLogic.java | 20 ---------------- .../logic/BmsChargingHandshakeDataLogic.java | 20 ---------------- .../com/xhpc/pp/logic/BmsErrorDataLogic.java | 23 +------------------ .../xhpc/pp/logic/BmsInterruptDataLogic.java | 23 +------------------ .../logic/RateModelConfigReplyDataLogic.java | 4 ---- .../xhpc/pp/logic/RateModelRequestLogic.java | 4 ---- .../xhpc/pp/logic/RateModelValidateLogic.java | 4 ---- .../java/com/xhpc/pp/logic/RegisterLogic.java | 4 ---- .../mapper/XhpcDeviceMessageMapper.xml | 16 +------------ 12 files changed, 3 insertions(+), 178 deletions(-) diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java index 1938b4ac..b3881863 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/domain/XhpcDeviceMessage.java +++ b/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 } 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 e8ce4e5c..8b28e1f2 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,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 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); } 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 index a65e668b..215beb0c 100644 --- 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 @@ -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 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); 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 index 7eb71ba2..612cd9f8 100644 --- 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 @@ -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 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); 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 index dc10c384..17f00ea6 100644 --- 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 @@ -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 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); 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 e4620b5b..5895bad2 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,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 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); } 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 c65dd592..b99ac2f5 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,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 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); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java index cea17cc9..19c0feca 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelConfigReplyDataLogic.java +++ b/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); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java index 6aabb188..9502f806 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelRequestLogic.java +++ b/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); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java index 7c555220..b2ad2891 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RateModelValidateLogic.java +++ b/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); diff --git a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java b/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java index bd651773..417859f2 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/java/com/xhpc/pp/logic/RegisterLogic.java +++ b/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); diff --git a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml index 3faba92b..f2423716 100644 --- a/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml +++ b/xhpc-modules/xhpc-power-pile/src/main/resources/mapper/XhpcDeviceMessageMapper.xml @@ -8,11 +8,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> log @@ -23,17 +19,11 @@ insert into xhpc_device_message( -<<<<<<< HEAD - type, - serial_number, - content, - reply_content, -======= + type, serial_number, content, charge_order_no, ->>>>>>> log status, create_by, remark, @@ -44,11 +34,7 @@ #{type}, #{serialNumber}, #{content}, -<<<<<<< HEAD - #{replyContent}, -======= #{chargeOrderNo}, ->>>>>>> log #{status}, #{createBy}, #{remark},