Merge branch 'bugfix_merge'

# Conflicts:
#	jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java
#	jcpp-protocol-yunkuaichong/READMD.md

jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/DefaultPileProtocolService.java

@@ -323,6 +323,14 @@ public class DefaultPileProtocolService implements PileProtocolService {
         callback.onSuccess();
     }
 
+    @Override
+    public void onBmsParamConfigReport(UplinkQueueMessage uplinkQueueMsg, Callback callback) {
+        log.info("充电桩与 BMS 参数配置阶段报文 {}", uplinkQueueMsg);
+
+        callback.onSuccess();
+    }
+
+
     private static Period createPeriod(int sn, LocalTime beginTime, LocalTime endTime, PricingModelFlag flag) {
         Period period = new Period();
         period.setSn(sn);
@@ -346,9 +354,4 @@ public class DefaultPileProtocolService implements PileProtocolService {
         builder.setRequestData(uplinkQueueMessage.getRequestData());
         return builder;
     }
-
-    @Override
-    public void onBmsParamConfigReport(UplinkQueueMessage uplinkQueueMsg, Callback callback) {
-        log.info("充电桩与 BMS 参数配置阶段报文 {}", uplinkQueueMsg);
-    }
 }

jcpp-protocol-yunkuaichong/READMD.md

@@ -2,63 +2,64 @@
 
 ---
 
-#### 上行登录
+> 示例统一桩编号：20231212000010 (HEX:20231212000010)
-> （桩编号：20231212000010）HEX:20231212000010
+> 示例统一枪编号：01
 
+#### 0x01 上行登录
 `68 22 00 19 00 01 20 23 12 12 00 00 10 01 01 10 47 56 2E 39 35 72 31 33 00 89 86 04 D1 17 22 D0 34 86 06 02 87 4E` 
-#### 下行登录应答
+#### 0x02 下行登录应答
 `68 0C 00 19 00 02 20 23 12 12 00 00 10 00 A1 55`
-#### 下行登录后对时
+#### 0x56 下行登录后对时
 `68 12 01 00 00 56 20 23 12 12 00 00 10 30 75 0F 11 12 0C 18 04 7D `
 
 ---
 
-#### 上行心跳
+#### 0x03 上行心跳
 `68 0d 25 d3 00 03 20 23 12 12 00 00 10 01 00 D1 AC`
-#### 下行心跳应答
+#### 0x04 下行心跳应答
 `68 09 25 D3 00 04 20 23 12 12 00 00 10 01 00 1D 0B`
 
 ---
 
-#### 上行计费模型验证
+#### 0x05 上行计费模型验证
 `68 0d 71 ad 00 05 20 23 12 12 00 00 10 00 00 222B`
-#### 下行计费模型验证应答
+#### 0x06 下行计费模型验证应答
 `68 0E AD 71 00 06 20 23 12 12 00 00 10 00 00 00 9E1A`
 
 ---
 
-#### 上行充电桩计费模型请求
+#### 0x09 上行充电桩计费模型请求
 `68 0B 00 07 00 09 20 23 12 12 00 00 10 72 ED`
-#### 下行计费模型请求应答
+#### 0x0A 下行计费模型请求应答
 `68 5A 00 07 00 0A 20 23 12 12 00 00 10 00 01 F8 24 01 00 C8 AF 00 00 F8 24 01 00 C8 AF 00 00 F8 24 01 00 C8 AF 00 00 F8 24 01 00 C8 AF 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 01 01 01 01 01 01 01 01 01 01 02 02 02 02 02 02 02 02 02 02 02 02 03 03 03 03 03 03 03 03 03 03 03 03 FE 63`
 
 ---
 
-#### 上报充电桩状态
+#### 0x13 上报充电桩状态
 `68 40 bb bd 00 13 20 23 12 12 00 00 10 00 00 00 00 10 05 71 36 00 32 01 06 00 39 56 00 02 03 02 01 94 0e f4 03 54 00 00 00 00 00 00 00 00 4e 55 10 00 20 00 c0 57 01 00 00 00 00 00 60 6c 01 00 00 00 93 73`
 
 ---
 
-#### 下发启动充电
+#### 0x34 下发启动充电
 `68 30 01 00 00 34 00 00 00 00 00 00 12 34 56 78 90 12 34 56 78 90 20 23 12 12 00 00 10 01 56 78 90 12 34 56 78 90 56 78 90 12 34 56 78 90 10 27 00 00 5f d9`
-#### 上行启动应答
+#### 0x33 上行启动应答
 `68 1E 00 02 00 33 00 00 00 00 00 00 12 34 56 78 90 12 34 56 78 90 20 23 12 12 00 00 10 01 01 00 41 1D`
 
 ---
 
-#### 上行交易记录
+#### 0x3B 上行交易记录
 `68 a2 00 46 00 3b 20 23 12 12 00 00 10 32 32 39 00 00 00 00 00 00 20 23 12 12 00 00 10 01 b0 36 04 11 6d 0c 17 a0 8c 09 11 6d 0c 17 f0 49 02 00 00 00 00 00 00 00 00 00 00 00 00 00 d0 fb 01 00 00 00 00 00 00 00 00 00 00 00 00 00 b0 ad 01 00 00 00 00 00 00 00 00 00 00 00 00 00 90 5f 01 00 72 06 00 00 72 06 00 00 78 05 00 00 00 00 00 00 00 00 00 00 00 00 72 06 00 00 72 06 00 00 78 05 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 a0 8c 09 11 6d 0c 17 40 00 00 00 00 00 00 00 00 03 E0`
-#### 下行交易就应答
+#### 0x40 下行交易就应答
-`68 15 00 46 00 06 20 23 12 12 00 00 10 32 32 39 00 00 00 00 00 00 00 C6 2D `
+`68 15 46 00 00 40 20 23 12 12 00 00 10 32 32 39 00 00 00 00 00 00 00 9D 7B`
 
 ---
 
-#### 充电桩与 BMS 充电错误报文
+### 0x17 上行BMS参数配置
-`68 24 00 17 00 1B 32 01 02 00 00 00 00 11 15 11 16 15 55 35 02 06 20 23 12 12 00 00 10 01 00 00 00 00 00 00 00 00 79 00`
+`68 31 00 16 00 17 32 01 02 00 00 00 00 11 15 11 16 15 55 35 02 60 20 23 12 12 00 00 10 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 78 BB`
 
 --- 
 
-### 7.4上行BMS参数配置
+#### 0x1B 充电桩与 BMS 充电错误报文
-`68 31 00 16 00 17 32 01 02 00 00 00 00 11 15 11 16 15 55 35 02 60 20 23 12 12 00 00 10 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 BB 78`
+`68 24 00 17 00 1B 32 01 02 00 00 00 00 11 15 11 16 15 55 35 02 06 20 23 12 12 00 00 10 01 00 00 00 00 00 00 00 00 79 00`
-
 
+---

jcpp-protocol-yunkuaichong/src/main/java/sanbing/jcpp/protocol/yunkuaichong/v150/cmd/YunKuaiChongV150BmsParamConfigReportULCmd.java

@@ -6,20 +6,18 @@
  */
 package sanbing.jcpp.protocol.yunkuaichong.v150.cmd;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import lombok.extern.slf4j.Slf4j;
+import sanbing.jcpp.infrastructure.util.codec.BCDUtil;
+import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil;
+import sanbing.jcpp.proto.gen.ProtocolProto.BmsParamConfigReport;
+import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage;
 import sanbing.jcpp.protocol.ProtocolContext;
 import sanbing.jcpp.protocol.listener.tcp.TcpSession;
 import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongUplinkCmdExe;
 import sanbing.jcpp.protocol.yunkuaichong.YunKuaiChongUplinkMessage;
 import sanbing.jcpp.protocol.yunkuaichong.annotation.YunKuaiChongCmd;
-import sanbing.jcpp.proto.gen.ProtocolProto.UplinkQueueMessage;
-import sanbing.jcpp.infrastructure.util.trace.TracerContextUtil;
-import sanbing.jcpp.proto.gen.ProtocolProto.BmsParamConfigReport;
-
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import sanbing.jcpp.infrastructure.util.codec.BCDUtil;
 
 import java.math.BigDecimal;
 
@@ -29,7 +27,7 @@ import java.math.BigDecimal;
  */
 @Slf4j
 @YunKuaiChongCmd(0x17)
-public class YunKuaiChongV150BmsParamConfigULCmd extends YunKuaiChongUplinkCmdExe {
+public class YunKuaiChongV150BmsParamConfigReportULCmd extends YunKuaiChongUplinkCmdExe {
     // 电流值偏移量常量（单位：安培）
     private static final BigDecimal CURRENT_OFFSET = new BigDecimal("-400.0");
     // 温度值偏移量常量（单位：摄氏度）