变长数据帧修改测试后提交

Service/Charger/Msg/Charger/Req/ModuleState.cs

@@ -12,46 +12,29 @@ namespace Service.Charger.Msg.Charger.Req
     /// </summary>
     public class ModuleState : ASDU
     {
-
         /// <summary>
-        /// 模块总数量
+        /// 记录类型
         /// </summary>
         [Property(0, 8)]
-        public byte ModelCount { get; set; }
+        public byte RecordType { get; set; }
         /// <summary>
-        /// 模块状态
+        /// 模块总数量
         /// </summary>
         [Property(8, 8)]
-        public byte ModelState1 { get; set; }
+        public byte ModelCount { get; set; }
-        /// <summary>
-        /// 模块状态
-        /// </summary>
-        [Property(16, 8)]
-        public byte ModelState2 { get; set; }
-        /// <summary>
-        /// 模块状态
-        /// </summary>
-        [Property(24, 8)]
-        public byte ModelState3 { get; set; }
-        /// <summary>
-        /// 模块状态
-        /// </summary>
-        [Property(32, 8)]
-        public byte ModelState4 { get; set; }
-        /// <summary>
-        /// 模块状态
-        /// </summary>
-        [Property(40, 8)]
-        public byte ModelState5 { get; set; }
         /// <summary>
         /// 模块状态
         /// </summary>
-        [Property(48, 8)]
+        [RelativeProperty(16, 8, "ModelCount")]
-        public byte ModelState6 { get; set; }
+        public List<ModelCount> LstModelCount { get; set; }
+    }
+
+    public class ModelCount
+    {
         /// <summary>
-        /// 模块状态
+        /// 当前 CSC 下的第 N 个模块状态
         /// </summary>
-        [Property(56, 8)]
+        [Property(0, 8)]
-        public byte ModelState7 { get; set; }
+        public byte ModelState { get; set; }
     }
 }

Service/Charger/Msg/Charger/Req/RealDataReporting.cs

@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Service.Charger.Msg.Charger.Req
-{
-    /// <summary>
-    /// 3.5.9 电池包实时数据上报（站内充电模式有电池包时周期性上传）
-    /// </summary>
-    public class RealDataReporting:ASDU
-    {
-        //TODO
-        /*
-电池包 SOC
-电池包 SOH
-电池包总电流，充电为负值，放电为正值
-电池包允许最大回充电电流值（脉冲)
-电池包允许最大放电电流值（脉冲）
-电池包正极绝缘值
-电池包负极绝缘值
-电池端高压(主继电器内侧)
-母线端高压(主继电器外侧)
-
-SOC
-SOH
-Total
-Charging
-Discharge
-Positive
-Negative
-Battery
-voltage
-         */
-    }
-}