diff --git a/Service/Charger/Msg/Charger/Req/ModuleState.cs b/Service/Charger/Msg/Charger/Req/ModuleState.cs index 1e61dac..63e3310 100644 --- a/Service/Charger/Msg/Charger/Req/ModuleState.cs +++ b/Service/Charger/Msg/Charger/Req/ModuleState.cs @@ -12,46 +12,29 @@ namespace Service.Charger.Msg.Charger.Req /// public class ModuleState : ASDU { - /// - /// 模块总数量 + /// 记录类型 /// [Property(0, 8)] - public byte ModelCount { get; set; } + public byte RecordType { get; set; } /// - /// 模块状态 + /// 模块总数量 /// [Property(8, 8)] - public byte ModelState1 { get; set; } - /// - /// 模块状态 - /// - [Property(16, 8)] - public byte ModelState2 { get; set; } - /// - /// 模块状态 - /// - [Property(24, 8)] - public byte ModelState3 { get; set; } - /// - /// 模块状态 - /// - [Property(32, 8)] - public byte ModelState4 { get; set; } - /// - /// 模块状态 - /// - [Property(40, 8)] - public byte ModelState5 { get; set; } + public byte ModelCount { get; set; } /// /// 模块状态 /// - [Property(48, 8)] - public byte ModelState6 { get; set; } + [RelativeProperty(16, 8, "ModelCount")] + public List LstModelCount { get; set; } + } + + public class ModelCount + { /// - /// 模块状态 + /// 当前 CSC 下的第 N 个模块状态 /// - [Property(56, 8)] - public byte ModelState7 { get; set; } + [Property(0, 8)] + public byte ModelState { get; set; } } } diff --git a/Service/Charger/Msg/Charger/Req/RealDataReporting.cs b/Service/Charger/Msg/Charger/Req/RealDataReporting.cs deleted file mode 100644 index 72a7fc2..0000000 --- a/Service/Charger/Msg/Charger/Req/RealDataReporting.cs +++ /dev/null @@ -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 -{ - /// - /// 3.5.9 电池包实时数据上报(站内充电模式有电池包时周期性上传) - /// - public class RealDataReporting:ASDU - { - //TODO - /* -电池包 SOC -电池包 SOH -电池包总电流,充电为负值,放电为正值 -电池包允许最大回充电电流值(脉冲) -电池包允许最大放电电流值(脉冲) -电池包正极绝缘值 -电池包负极绝缘值 -电池端高压(主继电器内侧) -母线端高压(主继电器外侧) - -SOC -SOH -Total -Charging -Discharge -Positive -Negative -Battery -voltage - */ - } -}