Merge branch 'log'

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/PileLogController.java

@@ -38,8 +38,9 @@ public class PileLogController extends BaseController {
     }
 
 
-    @GetMapping("/{pileId}")
+
-    public TableDataInfo getPileDetailPage(@PathVariable("pileId") String pileId) {
+    @GetMapping("/detail")
+    public TableDataInfo getPileDetailPage(@RequestParam("pileId") String pileId) {
         startPage();
         return getDataTable(pileLogService.getPileRunLogPage(pileId));
     }

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/controller/StationLogController.java

@@ -32,15 +32,17 @@ public class StationLogController extends BaseController {
     }
 
 
-    @GetMapping("/{stationId}")
+
-    public TableDataInfo getPileDetailPage(@PathVariable("stationId") Long stationId) {
+    @GetMapping("/detail")
+    public TableDataInfo getPileDetailPage(@RequestParam("stationId") Long stationId) {
+
         startPage();
         return getDataTable(stationLogService.getStationRatePage(stationId));
     }
 
 
-    @GetMapping("/rate/{rateId}")
+    @GetMapping("/rate/detail")
-    public AjaxResult getRateInfo(@PathVariable("rateId") Integer rateId) {
+    public AjaxResult getRateInfo(@RequestParam("rateId") Integer rateId) {
         return AjaxResult.success(stationLogService.getRateInfo(rateId));
     }
 }

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/domain/XhpcDeviceMessageDomain.java

@@ -8,18 +8,42 @@ import java.util.Date;
 @Data
 public class XhpcDeviceMessageDomain {
 
+    /**
+     * 消息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 +52,4 @@ public class XhpcDeviceMessageDomain {
 
     private String updateBy;
 
-    private String remark;
 }

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/mapper/XhpcChargingStationMapper.java

@@ -25,4 +25,7 @@ public interface XhpcChargingStationMapper {
 
 
     List<Map<String, Object>> selectRateTimeListByRateId(@Param("rateId")Integer rateId);
+
+    List<Map<String, Object>> selectBaseRateTimeListByRateId(@Param("rateId")Integer rateId);
+
 }

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/StationLogService.java

@@ -12,5 +12,6 @@ public interface StationLogService {
     List<Map<String, Object>> getStationRatePage(Long stationId);
 
 
-    List<Map<String, Object>> getRateInfo(int rateId);
+    Map<String, Object> getRateInfo(int rateId);
+
 }

xhpc-modules/xhpc-log/src/main/java/com/xhpc/log/service/impl/StationLogServiceImpl.java

@@ -5,6 +5,7 @@ import com.xhpc.log.service.StationLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -28,7 +29,11 @@ public class StationLogServiceImpl implements StationLogService {
 
 
     @Override
-    public List<Map<String, Object>> getRateInfo(int rateId){
+    public Map<String, Object> getRateInfo(int rateId){
-        return stationMapper.selectRateTimeListByRateId(rateId);
+        Map<String, Object> resData = new HashMap<>();
+        resData.put("base", stationMapper.selectBaseRateTimeListByRateId(rateId));
+        resData.put("current", stationMapper.selectRateTimeListByRateId(rateId));
+
+        return resData;
     }
 }

xhpc-modules/xhpc-log/src/main/resources/bootstrap.yml

@@ -27,7 +27,8 @@ spring:
 logging:
   level:
     root: info
-    com.xhpc.tradebill.mapper: debug
+    com.xhpc.log.mapper: debug
+
 
   file:
     path: "d:\\logs"
@@ -54,37 +55,3 @@ alibaba:
     certPath: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt"
     publicCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt"
     rootCertPath: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt"
-
-###获取微信openid地址
-#WXGETJSCODE: "https://api.weixin.qq.com/sns/jscode2session?appid=wxb14ef93e9b7901f3&secret=b5c5672141b5930c30a1abee95a2dcbf&js_code="
-###阿里云身份证验证地址
-#VERIFYCARD: "http://idenauthen.market.alicloudapi.com/idenAuthentication"
-##阿里云身份证验证地址appcode
-#APPCODE: "APPCODE e26d9088b58e24af69411d5933cece47"
-##小程序appid
-#APPID: "wxd0a48e00319ef8a7"
-##小程序绑定商户id
-#MCHID: "1514355771"
-##商户后台设置的key
-#KEY: "sichuanxianghuakejiyouxiangongsi"
-##微信小程序支付地址
-#WXPAYUNIFIEDORDER: "https://api.mch.weixin.qq.com/pay/unifiedorder"
-##微信支付回调地址
-#SERVERDOMAIN: "http://www.scxhua.cn/prod-api/xhpc-payment/wx/paymentCallback"
-##微信小程序支付地址
-#WXTRANSFERS: "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"
-
-##支付宝支付回调地址
-#ALIPAYPSERVERDOMAIN: "https://www.scxhua.cn/prod-api/xhpc-payment/alipay/notifyUrl"
-##支付宝公钥
-#ALIPAYPUBLICKEY:
-##应用私钥
-#ALIPAYPRIVATEKEY: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCGHX1s315EKjoIBkNiF3IxCAmvtVg+TdCDL/XmJZWdcZ23tEWmmIMsLRCLUKsaPfTEhnqD6EFJnmpJu4teDImo3aDbOoO31YFEXjMXUnTTS/dtDVEo1OecsRL+Re43KSohOkIL1TMyTuNfeIglQTuhCSZ3LOEOx4OHpYwcrLp8p1ORvAS7x35nsmjLp3oQTJo9RWfzfEaKbm6cxsWLKyr5/5eGDXrUHNC5hIDLjoJbe6iqNKyIiPJHtPZfJ36PcWa7PFvx4X+Ded32KZb2AA3p9w/HX7gn1MnRfT5NGH0k3ggxLNarDU8g6JjQYgNtmE/R8gbp99BudZNfDoSF1llNAgMBAAECggEAaTa9bSoXM/bErALt3ghyx1B8+OGVpts5F5IKoVEe/PNjPfkpIzdGwONhtUnF0cKFQaAWgWE1xuGGlO2Sumevn1Cvnw1axF+1F8Om5UcE67cPFvh5kUTlpyGrutt1tMSQjpy7r7jEf1UwP3e5pzBz7TPWf2wv635OC56uOtivPJZ+8vg7VYon/mNXQuL4AavoxfSDtvo0ad30X2fK1WKeeBtgiT4UzV6ZGZh5igKQHM4lVvmbo/jOeQD0KAod7pRe/h4FBFmCVIWwgW+I+Hnzp8A/nJezoowJ3jiTt0FodC9uBCT64ZCz5dVCryD62LDVjKBxB7cfIoQA+PxCiXr9QQKBgQD+2v38J/MlfK/XCYldclzumizwIw6T0Mv6XvYwXQHYgYDKYNF6k1LhMEUo7fP3EsPdV8h/nXmdU4qadOVm6QSJ/rGEl22yGlO7woUzTY/Ls9eknoqfMYuyI1+ICMnNxmesQbWyc0cOHh44cEF+icfJxEDAmrHGLmBVsKuLUJUuVQKBgQCGt663TF7mixghiUOcT11zC1fqG+dIcvAwHpCHfdxsniYRqnv+SLf6eC5PCkQ5aNAAl/ywOLQAWS0XgYti3LyZ4iuGIYcUE0IDDmhWl68V27iXcLIK+rBRqBGxSdk8xR+zSE8fpO4mXpxn8SH0Butex8PJ+oHTbmdXIUAXdn6HGQKBgQCvAB1rqtsRoL72ADxtCHy78u5srwXxhmyqrc6LgzIjQzn2vejaLJO6wfSbmFnwDNimAwNQbgf2ekkwqphjxBozz8qB66GNrPpWccoZYmcdT48CIUO68MCmQBf3R2GbhWPnKu/ja7kc/p1tz9eJVn70E2kLWK4+EdZgwQHqlhj6SQKBgF4AmbdpYOb5s9Li1vyhHJIEHkpLQi15lkPdb/g7SK26BNJa5b5fu5DYf2fDwCtXCZ0AcN/+EQwVLbOzPzGy2R9/g+NKTdkiPvOnAAM8QH2+HaX+ix3CI3o3DnFpGF6hJieRkzR/f3Ximryks451rZMrTWEIncKMzSstFm3Izy0xAoGBAJQaMqlzpM+QaJiytJNeqRpPWRsi0Dkf4XqJXPWLOrApSISsafZF5vk2ZOeIqRsVCBH3LdfVIJxEBAF4l/Sd2q7xC9JHawJDqa4ea7VwL68ANH2w3jcJ3j6DQqf7NIe/lSGxYF6Jt+74oRFHxN3GDSf+z91DYfZz8hQnyphKDNEJ"
-##支付宝appid
-#ALIPAYAPPID: "2021002156615717"
-##应用公钥证书路径
-#CERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/appCertPublicKey.crt"
-##支付宝公钥证书路径
-#PUBLICCERTPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayCertPublicKey_RSA2.crt"
-##支付宝根证书路径
-#ROOTCRETPATH: "/www/wwwroot/scxhua.cn/xhpc-payment/alipayRootCert.crt"

xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcChargingStationMapper.xml

@@ -31,7 +31,8 @@
     <select id="selectRateListByStationId" resultType="map">
         select
             rate_model_id as 'rateId',
-            create_time as 'createTime'
+            create_time as 'createTime',
+            create_by as 'createBy'
         from xhpc_rate_time
         where charging_station_id=#{stationId}
         group by rate_model_id
@@ -50,4 +51,14 @@
                  left join xhpc_rate as ra on ra.rate_id = rt.rate_id
         where rt.rate_model_id =#{rateId}
     </select>
+
+
+    <select id="selectBaseRateTimeListByRateId" resultType="map">
+        SELECT
+            name as 'name',
+            power_fee as 'powerFee',
+            service_fee as 'serviceFee'
+        FROM xhpc_rate
+        WHERE rate_model_id=#{rateId};
+    </select>
 </mapper>

xhpc-modules/xhpc-log/src/main/resources/mapper/XhpcDeviceMessageMapper.xml

@@ -9,7 +9,7 @@
             type as 'type',
             serial_number as 'serialNumber',
             content as 'content',
-            reply_content as 'replyContent',
+            charge_order_no as 'chargeOrderNo',
             status as 'status',
             remark as 'remark',
             create_time as 'createTime',
@@ -33,7 +33,7 @@
                 m.type as 'type',
                 m.serial_number as 'serialNumber',
                 m.content as 'content',
-                m.reply_content as 'replyContent',
+                m.charge_order_no as 'chargeOrderNo',
                 m.status as 'status',
                 m.remark as 'remark',
                 m.create_time as 'createTime',
@@ -58,6 +58,10 @@
         <if test="params.serialNumber !=null and params.serialNumber!=''">
             and cp.serial_number=#{params.serialNumber}
         </if>
+        <if test="params.chargeOrderNo !=null and params.chargeOrderNo!=''">
+            and m.charge_order_no=#{params.chargeOrderNo}
+        </if>
+
     </select>
 
 </mapper>

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

@@ -8,6 +8,7 @@ import java.util.Date;
 @Data
 public class XhpcDeviceMessage {
 
+<<<<<<< HEAD
     private Long deviceMessageId;
 
     private String type;
@@ -20,6 +21,43 @@ public class XhpcDeviceMessage {
 
     private Integer status;
 
+=======
+    /**
+     * 消息ID
+     */
+    private Long deviceMessageId;
+
+    /**
+     * 设备类型
+     */
+    private String type;
+
+    /**
+     * 设备编码
+     */
+    private String serialNumber;
+
+    /**
+     * 充电订单号
+     */
+    private String chargeOrderNo;
+
+    /**
+     * 报文内容
+     */
+    private String content;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 备注描述
+     */
+    private String remark;
+
+>>>>>>> log
     private Date createTime;
 
     private String createBy;
@@ -28,5 +66,8 @@ 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,16 +1,19 @@
 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;
 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 +25,12 @@ 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;
 
@@ -31,11 +38,14 @@ 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());
@@ -43,6 +53,10 @@ public class BmsChargerInterruptDataLogic 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/BmsChargingCompletedDataLogic.java

@@ -1,16 +1,19 @@
 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;
 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 +25,9 @@ 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;
 
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
@@ -32,12 +36,15 @@ public class BmsChargingCompletedDataLogic 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());
@@ -45,6 +52,10 @@ 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,16 +1,19 @@
 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;
 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 +25,9 @@ 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;
 
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
@@ -33,11 +37,14 @@ public class BmsChargingConfigDataLogic implements ServiceLogic {
         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());
@@ -45,6 +52,10 @@ 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/BmsChargingDataLogic.java

@@ -1,16 +1,17 @@
 package com.xhpc.pp.logic;
 
-import com.xhpc.mapper.XhpcMessageMapper;
+import com.xhpc.common.enums.StationDeviceEnum;
-import com.xhpc.pp.domain.XhpcMessage;
+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
+    @Resource
-    private XhpcMessageMapper xhpcMessageMapper;
+    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"));
+        XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
-        msg.setChargeOrderNo((String) req.get("orderNo"));
+        deviceMessage.setType(StationDeviceEnum.PILE.getCode());
-        msg.setRemark("充电桩与 BMS 充电过程 BMS 信息");
+        deviceMessage.setSerialNumber(sp.getPileNo());
-        xhpcMessageMapper.insertItemsBy(msg);
+        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);
     }
 

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

@@ -1,16 +1,19 @@
 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;
 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 +25,9 @@ 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;
 
     @Resource
     XhpcDeviceMessageMapper deviceMessageMapper;
@@ -33,11 +37,14 @@ public class BmsChargingHandshakeDataLogic implements ServiceLogic {
         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());
@@ -45,6 +52,10 @@ 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,16 +1,19 @@
 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;
 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 +25,12 @@ 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;
 
@@ -31,11 +38,14 @@ 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());
@@ -43,6 +53,10 @@ 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,16 +1,19 @@
 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;
 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 +25,12 @@ 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;
 
@@ -31,11 +38,14 @@ 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());
@@ -43,6 +53,10 @@ 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/BmsReqChargerOutputDataLogic.java

@@ -1,16 +1,17 @@
 package com.xhpc.pp.logic;
 
-import com.xhpc.mapper.XhpcMessageMapper;
+import com.xhpc.common.enums.StationDeviceEnum;
-import com.xhpc.pp.domain.XhpcMessage;
+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
+    @Resource
-    private XhpcMessageMapper xhpcMessageMapper;
+    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"));
+        XhpcDeviceMessage deviceMessage = new XhpcDeviceMessage();
-        msg.setChargeOrderNo((String) req.get("orderNo"));
+        deviceMessage.setType(StationDeviceEnum.PILE.getCode());
-        msg.setRemark("充电桩与 BMS 充电过程 BMS 需求、充电机输出");
+        deviceMessage.setSerialNumber(sp.getPileNo());
-        xhpcMessageMapper.insertItemsBy(msg);
+        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);
     }
 

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

@@ -55,7 +55,10 @@ 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,7 +56,10 @@ 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,7 +72,10 @@ 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,7 +91,10 @@ 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/java/com/xhpc/pp/server/ChargingPileBinaryHandler.java

@@ -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");

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

@@ -8,7 +8,11 @@
         <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"/>
@@ -19,10 +23,17 @@
 
     <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>
@@ -33,7 +44,11 @@
         <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>