充电机部分修改

Entity/Dto/Resp/BatteryBaseInfoResp.cs

@@ -5,8 +5,10 @@
 /// </summary>
 public class BatteryBaseInfoResp
 {
-    public string Pgn { get; set; }
+    /// <summary>
-    
+    /// 电池编码
+    /// </summary>
+    public string BatteryNo { get; set; }
     /// <summary>
     /// 电池包额定量度
     /// </summary>

Service/Charger/Msg/Charger/Req/Login.cs

@@ -16,73 +16,73 @@ namespace Service.Charger.Msg.Charger.Req
         /// <summary>
         /// 监控网关编号
         /// </summary>
-        [Property(8, 16)]
+        [Property(8, 8*16)]
-        public UInt16 GatewayNo { get; set; }
+        public String GatewayNo { get; set; }
 
         /// <summary>
         /// 设备属性
         /// </summary>
-        [Property(24, 8)]
+        [Property(24+14*8, 8)]
         public byte EquipType { get; set; }
 
         /// <summary>
         /// 通讯协议版本
         /// </summary>
-        [Property(32, 8)] public byte ConnProtocolVersion0 { get; set; }
+        [Property(32+14*8, 8)] public byte ConnProtocolVersion0 { get; set; }
-        [Property(40, 8)] public byte ConnProtocolVersion1 { get; set; }
+        [Property(40+14*8, 8)] public byte ConnProtocolVersion1 { get; set; }
-        [Property(48, 8)] public byte ConnProtocolVersion2 { get; set; }
+        [Property(48+14*8, 8)] public byte ConnProtocolVersion2 { get; set; }
         public string ConnProtocolVersion { get; set; }
 
         /// <summary>
         /// 充电控制器硬件版本号
         /// </summary>
-        [Property(56, 8)] public byte ControllerHardwareVersion0 { get; set; }
+        [Property(56+14*8, 8)] public byte ControllerHardwareVersion0 { get; set; }
-        [Property(64, 8)] public byte ControllerHardwareVersion1 { get; set; }
+        [Property(64+14*8, 8)] public byte ControllerHardwareVersion1 { get; set; }
-        [Property(72, 8)] public byte ControllerHardwareVersion2 { get; set; }
+        [Property(72+14*8, 8)] public byte ControllerHardwareVersion2 { get; set; }
         public string ControllerHardwareVersion { get; set; }
 
         /// <summary>
         /// 充电控制器软件版本
         /// </summary>
-        [Property(80, 8)] public byte ControllerSoftwareVersion0 { get; set; }
+        [Property(80+14*8, 8)] public byte ControllerSoftwareVersion0 { get; set; }
-        [Property(88, 8)] public byte ControllerSoftwareVersion1 { get; set; }
+        [Property(88+14*8, 8)] public byte ControllerSoftwareVersion1 { get; set; }
-        [Property(96, 8)] public byte ControllerSoftwareVersion2 { get; set; }
+        [Property(96+14*8, 8)] public byte ControllerSoftwareVersion2 { get; set; }
         public string ControllerSoftwareVersion { get; set; }
 
         /// <summary>
         /// 充电枪口数目
         /// </summary>
-        [Property(104, 8)]
+        [Property(104+14*8, 8)]
         public byte GunNum { get; set; }
 
         /// <summary>
         /// 充电模块数目
         /// </summary>
-        [Property(112, 8)]
+        [Property(112+14*8, 8)]
         public byte GunModuleNum { get; set; }
 
         /// <summary>
         /// 额定功率
         /// </summary>
-        [Property(128, 16)]
+        [Property(128+14*8, 16)]
         public ushort RatedPower { get; set; }
 
         /// <summary>
         /// 当前功率
         /// </summary>
-        [Property(136, 8)]
+        [Property(136+14*8, 8)]
         public byte CurrentPower { get; set; }
 
         /// <summary>
         /// 当前速率
         /// </summary>
-        [Property(144, 8)]
+        [Property(144+14*8, 8)]
         public byte CurrentSpeed { get; set; }
 
         /// <summary>
         /// 分流器量程
         /// </summary>
-        [Property(152, 16)]
+        [Property(152+14*8, 16)]
         public ushort DiverterRange { get; set; }
     }
 }

Service/Charger/Msg/Charger/Req/VehicleVIN.cs

@@ -22,5 +22,12 @@ namespace Service.Charger.Msg.Charger.Req
         /// </summary>
         [Property(8, 17, type: PropertyReadConstant.Byte)]
         public string Vin { get; set; }
+        
+        
+        /// <summary>
+        /// VIN
+        /// </summary>
+        [Property(8+17*8, 1, type: PropertyReadConstant.Byte)]
+        public byte GunNo { get; set; }
     }
 }

Service/Charger/Msg/Charger/Resp/BatteryBaseInfo.cs

@@ -7,47 +7,53 @@ namespace Service.Charger.Msg.Charger.Resp;
 /// </summary>
 public class BatteryBaseInfo: ASDU
 {
-    [Property(0, 24)]
+    /// <summary>
-    public string Pgn { get; set; }
+    /// 记录类型
+    /// </summary>
+    [Property(0, 8)]
+    public byte RecordType { get; set; }
+    
+    [Property(8, 8*16)]
+    public string BatteryNo { get; set; }
     
     /// <summary>
     /// 电池包额定量度
     /// </summary>
-    [Property(0, 16)]
+    [Property(0+8*17, 16)]
     public byte RatedMeasurement{get;set;}
     /// <summary>
     /// 电池包额定电压
     /// </summary>
-    [Property(16, 16)]
+    [Property(16+8*17, 16)]
     public byte PackVoltage{get;set;}
     /// <summary>
     /// 电池包额定总能量
     /// </summary>
-    [Property(32, 16)]
+    [Property(32+8*17, 16)]
     public byte RatedBatteryPack{get;set;}
     /// <summary>
     /// 电池冷却方式
     /// </summary>
-    [Property(48, 8)]
+    [Property(48+8*17, 8)]
     public byte BatteryCoolingSystem{get;set;}
     /// <summary>
     /// 电池类型
     /// </summary>
-    [Property(56, 8)]
+    [Property(56+8*17, 8)]
     public byte BatteryType{get;set;}
     /// <summary>
     /// 电池系统中 CSC总的数目（电池监控单元数目）
     /// </summary>
-    [Property(64, 8)]
+    [Property(64+8*17, 8)]
     public byte BatteryCSCSNumber{get;set;}
     /// <summary>
     /// PACK 中单体电芯的总数目
     /// </summary>
-    [Property(72, 16)]
+    [Property(72+8*17, 16)]
     public byte PACKNumber{get;set;} 
     /// <summary>
     /// PACK 中电芯温度点（探针）的总数目
     /// </summary>
-    [Property(88, 16)]
+    [Property(88+8*17, 16)]
     public byte PACKTemperatureNumber{get;set;}
 }