diff --git a/Service/Charger/Codec/Decoder.cs b/Service/Charger/Codec/Decoder.cs index dc6ecc5..866c84f 100644 --- a/Service/Charger/Codec/Decoder.cs +++ b/Service/Charger/Codec/Decoder.cs @@ -249,7 +249,7 @@ public class Decoder : ByteToMessageDecoder 7 => ModelConvert.Decode(bytes), 12 => ModelConvert.Decode(bytes), 11 => ModelConvert.Decode(bytes), - 14 => ModelConvert.Decode(bytes), + 13 => ModelConvert.Decode(bytes), 10 => ModelConvert.Decode(bytes), _ => throw new InvalidOperationException("This should never be reached"), }, diff --git a/Service/Charger/Common/ChargerUtils.cs b/Service/Charger/Common/ChargerUtils.cs index 655b6dd..5774845 100644 --- a/Service/Charger/Common/ChargerUtils.cs +++ b/Service/Charger/Common/ChargerUtils.cs @@ -108,45 +108,6 @@ public static class ChargerUtils } - - /// - /// 根据本地充电枪编号,充电机code,计算云平台下发充电枪编号 - /// - /// - /// - /// - /// - public static string ReverseCalculateChargerGun(byte chargerGun, string chargerCode) - { - int number; - - if (int.TryParse(chargerCode, out number)) - { - int originalChargerGun; - - if (chargerGun == 2) - { - // 站外2枪 - originalChargerGun = number * 2; - } - else if (chargerGun == 1) - { - // 站外1枪 - originalChargerGun = number * 2 - 1; - } - else - { - throw new ArgumentException("无效的chargerGun"); - } - - return originalChargerGun.ToString(); - } - else - { - throw new ArgumentException("转换失败"); - } - } - /// /// 计算Byte随机数值 /// diff --git a/Service/Charger/Handler/OutCharger/PileChargeCompleteHandler.cs b/Service/Charger/Handler/OutCharger/PileChargeCompleteHandler.cs index 5e72ddf..04aee75 100644 --- a/Service/Charger/Handler/OutCharger/PileChargeCompleteHandler.cs +++ b/Service/Charger/Handler/OutCharger/PileChargeCompleteHandler.cs @@ -25,6 +25,10 @@ public class PileChargeCompleteHandler : SimpleChannelInboundHandler= 1 && msg.FlagOfTime1 <= 4) - { - powersPeriods[msg.FlagOfTime1 - 1] += msg.ChargingPowerOfTime1; - } - - if (msg.FlagOfTime2 >= 1 && msg.FlagOfTime2 <= 4) - { - powersPeriods[msg.FlagOfTime2 - 1] += msg.ChargingPowerOfTime2; - } - - if (msg.FlagOfTime3 >= 1 && msg.FlagOfTime3 <= 4) - { - powersPeriods[msg.FlagOfTime3 - 1] += msg.ChargingPowerOfTime3; - } - - if (msg.FlagOfTime4 >= 1 && msg.FlagOfTime4 <= 4) - { - powersPeriods[msg.FlagOfTime4 - 1] += msg.ChargingPowerOfTime4; - } - - if (msg.FlagOfTime5 >= 1 && msg.FlagOfTime5 <= 4) - { - powersPeriods[msg.FlagOfTime5 - 1] += msg.ChargingPowerOfTime5; - } - - if (msg.FlagOfTime6 >= 1 && msg.FlagOfTime6 <= 4) - { - powersPeriods[msg.FlagOfTime6 - 1] += msg.ChargingPowerOfTime6; - } - - if (msg.FlagOfTime7 >= 1 && msg.FlagOfTime7 <= 4) - { - powersPeriods[msg.FlagOfTime7 - 1] += msg.ChargingPowerOfTime7; - } - - if (msg.FlagOfTime8 >= 1 && msg.FlagOfTime8 <= 4) - { - powersPeriods[msg.FlagOfTime8 - 1] += msg.ChargingPowerOfTime8; - } - + if (msg.FlagOfTime1 >= 1 && msg.FlagOfTime1 <= 4){powersPeriods[msg.FlagOfTime1 - 1] += msg.ChargingPowerOfTime1;} + if (msg.FlagOfTime2 >= 1 && msg.FlagOfTime2 <= 4){powersPeriods[msg.FlagOfTime2 - 1] += msg.ChargingPowerOfTime2;} + if (msg.FlagOfTime3 >= 1 && msg.FlagOfTime3 <= 4){powersPeriods[msg.FlagOfTime3 - 1] += msg.ChargingPowerOfTime3;} + if (msg.FlagOfTime4 >= 1 && msg.FlagOfTime4 <= 4){powersPeriods[msg.FlagOfTime4 - 1] += msg.ChargingPowerOfTime4;} + if (msg.FlagOfTime5 >= 1 && msg.FlagOfTime5 <= 4){powersPeriods[msg.FlagOfTime5 - 1] += msg.ChargingPowerOfTime5;} + if (msg.FlagOfTime6 >= 1 && msg.FlagOfTime6 <= 4){powersPeriods[msg.FlagOfTime6 - 1] += msg.ChargingPowerOfTime6;} + if (msg.FlagOfTime7 >= 1 && msg.FlagOfTime7 <= 4){powersPeriods[msg.FlagOfTime7 - 1] += msg.ChargingPowerOfTime7;} + if (msg.FlagOfTime8 >= 1 && msg.FlagOfTime8 <= 4){powersPeriods[msg.FlagOfTime8 - 1] += msg.ChargingPowerOfTime8;} + if (msg.FlagOfTime9 >= 1 && msg.FlagOfTime9 <= 4){powersPeriods[msg.FlagOfTime9 - 1] += msg.ChargingPowerOfTime9;} + if (msg.FlagOfTime10 >= 1 && msg.FlagOfTime10 <= 4){powersPeriods[msg.FlagOfTime10 - 1] += msg.ChargingPowerOfTime10;} + if (msg.FlagOfTime11 >= 1 && msg.FlagOfTime11 <= 4){powersPeriods[msg.FlagOfTime11 - 1] += msg.ChargingPowerOfTime11;} + if (msg.FlagOfTime12 >= 1 && msg.FlagOfTime12 <= 4){powersPeriods[msg.FlagOfTime12 - 1] += msg.ChargingPowerOfTime12;} + if (msg.FlagOfTime13 >= 1 && msg.FlagOfTime13 <= 4){powersPeriods[msg.FlagOfTime13 - 1] += msg.ChargingPowerOfTime13;} + if (msg.FlagOfTime14 >= 1 && msg.FlagOfTime14 <= 4){powersPeriods[msg.FlagOfTime14 - 1] += msg.ChargingPowerOfTime14;} float[] acPowersPeriods = new float[4] { 0, 0, 0, 0 }; //元素索引顺序代表值;1:尖;2:峰;3:平;4:谷 - if (msg.AcFlagOfTime1 >= 1 && msg.AcFlagOfTime1 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime1 - 1] += msg.AcChargingPowerOfTime1; - } - - if (msg.AcFlagOfTime2 >= 1 && msg.AcFlagOfTime2 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime2 - 1] += msg.AcChargingPowerOfTime2; - } - - if (msg.AcFlagOfTime3 >= 1 && msg.AcFlagOfTime3 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime3 - 1] += msg.AcChargingPowerOfTime3; - } - - if (msg.AcFlagOfTime4 >= 1 && msg.AcFlagOfTime4 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime4 - 1] += msg.AcChargingPowerOfTime4; - } - - if (msg.AcFlagOfTime5 >= 1 && msg.AcFlagOfTime5 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime5 - 1] += msg.AcChargingPowerOfTime5; - } - - if (msg.AcFlagOfTime6 >= 1 && msg.AcFlagOfTime6 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime6 - 1] += msg.AcChargingPowerOfTime6; - } - - if (msg.AcFlagOfTime7 >= 1 && msg.AcFlagOfTime7 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime7 - 1] += msg.AcChargingPowerOfTime7; - } - - if (msg.AcFlagOfTime8 >= 1 && msg.AcFlagOfTime8 <= 4) - { - acPowersPeriods[msg.AcFlagOfTime8 - 1] += msg.AcChargingPowerOfTime8; - } + if (msg.AcFlagOfTime1 >= 1 && msg.AcFlagOfTime1 <= 4){acPowersPeriods[msg.AcFlagOfTime1 - 1] += msg.AcChargingPowerOfTime1;} + if (msg.AcFlagOfTime2 >= 1 && msg.AcFlagOfTime2 <= 4){acPowersPeriods[msg.AcFlagOfTime2 - 1] += msg.AcChargingPowerOfTime2;} + if (msg.AcFlagOfTime3 >= 1 && msg.AcFlagOfTime3 <= 4){acPowersPeriods[msg.AcFlagOfTime3 - 1] += msg.AcChargingPowerOfTime3;} + if (msg.AcFlagOfTime4 >= 1 && msg.AcFlagOfTime4 <= 4){acPowersPeriods[msg.AcFlagOfTime4 - 1] += msg.AcChargingPowerOfTime4;} + if (msg.AcFlagOfTime5 >= 1 && msg.AcFlagOfTime5 <= 4){acPowersPeriods[msg.AcFlagOfTime5 - 1] += msg.AcChargingPowerOfTime5;} + if (msg.AcFlagOfTime6 >= 1 && msg.AcFlagOfTime6 <= 4){acPowersPeriods[msg.AcFlagOfTime6 - 1] += msg.AcChargingPowerOfTime6;} + if (msg.AcFlagOfTime7 >= 1 && msg.AcFlagOfTime7 <= 4){acPowersPeriods[msg.AcFlagOfTime7 - 1] += msg.AcChargingPowerOfTime7;} + if (msg.AcFlagOfTime8 >= 1 && msg.AcFlagOfTime8 <= 4){acPowersPeriods[msg.AcFlagOfTime8 - 1] += msg.AcChargingPowerOfTime8;} + if (msg.AcFlagOfTime9 >= 1 && msg.AcFlagOfTime9 <= 4){acPowersPeriods[msg.AcFlagOfTime9 - 1] += msg.AcChargingPowerOfTime9;} + if (msg.AcFlagOfTime10 >= 1 && msg.AcFlagOfTime10 <= 4){acPowersPeriods[msg.AcFlagOfTime10 - 1] += msg.AcChargingPowerOfTime10;} + if (msg.AcFlagOfTime11 >= 1 && msg.AcFlagOfTime11 <= 4){acPowersPeriods[msg.AcFlagOfTime11 - 1] += msg.AcChargingPowerOfTime11;} + if (msg.AcFlagOfTime12 >= 1 && msg.AcFlagOfTime12 <= 4){acPowersPeriods[msg.AcFlagOfTime12 - 1] += msg.AcChargingPowerOfTime12;} + if (msg.AcFlagOfTime13 >= 1 && msg.AcFlagOfTime13 <= 4){acPowersPeriods[msg.AcFlagOfTime13 - 1] += msg.AcChargingPowerOfTime13;} + if (msg.AcFlagOfTime14 >= 1 && msg.AcFlagOfTime14 <= 4){acPowersPeriods[msg.AcFlagOfTime14 - 1] += msg.AcChargingPowerOfTime14;} return acPowersPeriods; } diff --git a/Service/Charger/Msg/Charger/OutCharger/Req/PileUploadChargeRecord.cs b/Service/Charger/Msg/Charger/OutCharger/Req/PileUploadChargeRecord.cs index af8661e..3d5975a 100644 --- a/Service/Charger/Msg/Charger/OutCharger/Req/PileUploadChargeRecord.cs +++ b/Service/Charger/Msg/Charger/OutCharger/Req/PileUploadChargeRecord.cs @@ -99,17 +99,6 @@ public class PileUploadChargeRecord : ASDU [Property(360, 8)] public byte EndYear { get; set; } - - /// - /// 充电开始时间 秒-分-时-日-月-年 - /// - public string StartTime { get; set; } - - /// - /// 充电结束时间 - /// - public string EndTime { get; set; } - /// /// 1 枪充电前电能表数据 /// @@ -354,245 +343,537 @@ public class PileUploadChargeRecord : ASDU /// /// 时段8 标识 /// - [Property(992, 8)] + [Property(992, 8)] //976 public byte FlagOfTime8 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(592 + 56 * 7 + 16, 8)] + public byte StartTime9 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(600 + 56 * 7 + 16, 8)] + public byte StartTimeMinute9 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(608 + 56 * 7 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime9 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(640 + 56 * 7 + 16, 8)] + public byte FlagOfTime9 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(648 + 56 * 7 + 16, 8)] + public byte StartTime10 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(656 + 56 * 7 + 16, 8)] + public byte StartTimeMinute10 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(664 + 56 * 7 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime10 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(696 + 56 * 7 + 16, 8)] + public byte FlagOfTime10 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(704 + 56 * 7 + 16, 8)] + public byte StartTime11 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(712 + 56 * 7 + 16, 8)] + public byte StartTimeMinute11 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(720 + 56 * 7 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime11 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(752 + 56 * 7 + 16, 8)] + public byte FlagOfTime11 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(760 + 56 * 7 + 16, 8)] + public byte StartTime12 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(768 + 56 * 7 + 16, 8)] + public byte StartTimeMinute12 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(776 + 56 * 7 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime12 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(808 + 56 * 7 + 16, 8)] + public byte FlagOfTime12 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(816 + 56 * 7 + 16, 8)] + public byte StartTime13 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(824 + 56 * 7 + 16, 8)] + public byte StartTimeMinute13 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(832 + 56 * 7 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime13 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(864 + 56 * 7 + 16, 8)] + public byte FlagOfTime13 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(872 + 56 * 7 + 16, 8)] + public byte StartTime14 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(880 + 56 * 7 + 16, 8)] + public byte StartTimeMinute14 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(888 + 56 * 7 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime14 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(920 + 56 * 7 + 16, 8)] + public byte FlagOfTime14 { get; set; } + + /// /// 充电模式 0:站内充电 1:站外充电 /// - [Property(1000, 8)] + [Property(984 + 336 + 16, 8)] public byte ChargeMode { get; set; } /// /// 启动模式 0: 站控启动 1:本地启动 /// - [Property(1008, 8)] + [Property(992 + 336 + 16, 8)] public byte StartMode { get; set; } - /// /// 充电前直流表值 /// - [Property(1016, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1000 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float DcMeterDataBefore { get; set; } /// /// 充电后直流表值 /// - [Property(1048, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1032 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float DcMeterDataAfter { get; set; } - /// /// 充电前交流表值 /// - [Property(1080, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1064 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcMeterDataBefore { get; set; } /// /// 充电后交流表值 /// - [Property(1112, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1096 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcMeterDataAfter { get; set; } /// - /// 本次充电交流表值 + /// 交流表充电量 /// - [Property(1144, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1128 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcMeterElecCount { get; set; } + #region 交流峰谷电 + /// /// 时段1 开始时间 时 /// - [Property(1176, 8)] + [Property(1160 + 336 + 16, 8)] public byte AcStartTime1 { get; set; } /// /// 时段1 开始时间 分 /// - [Property(1184, 8)] + [Property(1168 + 336 + 16, 8)] public byte AcStartTimeMinute1 { get; set; } /// /// 时段1 电量 /// - [Property(1192, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime1 { get; set; } /// /// 时段1 标识 /// - [Property(1224, 8)] + [Property(1208 + 336 + 16, 8)] public byte AcFlagOfTime1 { get; set; } - /// /// 时段2 开始时间 时 /// - [Property(1232, 8)] + [Property(1160 + 56 + 336 + 16, 8)] public byte AcStartTime2 { get; set; } /// /// 时段2 开始时间 分 /// - [Property(1240, 8)] + [Property(1168 + 56 + 336, 8)] public byte AcStartTimeMinute2 { get; set; } /// /// 时段2 电量 /// - [Property(1248, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime2 { get; set; } /// /// 时段2 标识 /// - [Property(1280, 8)] + [Property(1208 + 56 + 336 + 16, 8)] public byte AcFlagOfTime2 { get; set; } /// /// 时段3 开始时间 时 /// - [Property(1288, 8)] + [Property(1160 + 56 * 2 + 336 + 16, 8)] public byte AcStartTime3 { get; set; } /// /// 时段3 开始时间 分 /// - [Property(1296, 8)] + [Property(1168 + 56 * 2 + 336 + 16, 8)] public byte AcStartTimeMinute3 { get; set; } /// /// 时段3 电量 /// - [Property(1304, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 2 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime3 { get; set; } /// /// 时段3 标识 /// - [Property(1336, 8)] + [Property(1208 + 56 * 2 + 336 + 16, 8)] public byte AcFlagOfTime3 { get; set; } /// /// 时段4 开始时间 时 /// - [Property(1344, 8)] + [Property(1160 + 56 * 3 + 336 + 16, 8)] public byte AcStartTime4 { get; set; } /// /// 时段4 开始时间 分 /// - [Property(1352, 8)] + [Property(1168 + 56 * 3 + 336 + 16, 8)] public byte AcStartTimeMinute4 { get; set; } /// /// 时段4 电量 /// - [Property(1360, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 3 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime4 { get; set; } /// /// 时段4 标识 /// - [Property(1392, 8)] + [Property(1208 + 56 * 3 + 336 + 16, 8)] public byte AcFlagOfTime4 { get; set; } /// /// 时段5 开始时间 时 /// - [Property(1400, 8)] + [Property(1160 + 56 * 4 + 336 + 16, 8)] public byte AcStartTime5 { get; set; } /// /// 时段5 开始时间 分 /// - [Property(1408, 8)] + [Property(1168 + 56 * 4 + 336 + 16, 8)] public byte AcStartTimeMinute5 { get; set; } /// /// 时段5 电量 /// - [Property(1416, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 4 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime5 { get; set; } /// /// 时段5 标识 /// - [Property(1448, 8)] + [Property(1208 + 56 * 4 + 336 + 16, 8)] public byte AcFlagOfTime5 { get; set; } /// /// 时段6 开始时间 时 /// - [Property(1456, 8)] + [Property(1160 + 56 * 5 + 336 + 16, 8)] public byte AcStartTime6 { get; set; } /// /// 时段6 开始时间 分 /// - [Property(1464, 8)] + [Property(1168 + 56 * 5 + 336 + 16, 8)] public byte AcStartTimeMinute6 { get; set; } /// /// 时段6 电量 /// - [Property(1472, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 5 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime6 { get; set; } /// /// 时段6 标识 /// - [Property(1504, 8)] + [Property(1208 + 56 * 5 + 336 + 16, 8)] public byte AcFlagOfTime6 { get; set; } /// /// 时段7 开始时间 时 /// - [Property(1512, 8)] + [Property(1160 + 56 * 6 + 336 + 16, 8)] public byte AcStartTime7 { get; set; } /// /// 时段7 开始时间 分 /// - [Property(1520, 8)] + [Property(1168 + 56 * 6 + 336 + 16, 8)] public byte AcStartTimeMinute7 { get; set; } /// /// 时段7 电量 /// - [Property(1528, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 6 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime7 { get; set; } /// /// 时段7 标识 /// - [Property(1560, 8)] + [Property(1208 + 56 * 6 + 336 + 16, 8)] public byte AcFlagOfTime7 { get; set; } /// /// 时段8 开始时间 时 /// - [Property(1568, 8)] + [Property(1160 + 56 * 7 + 336 + 16, 8)] public byte AcStartTime8 { get; set; } /// /// 时段8 开始时间 分 /// - [Property(1572, 8)] + [Property(1168 + 56 * 7 + 336 + 16, 8)] public byte AcStartTimeMinute8 { get; set; } /// /// 时段8 电量 /// - [Property(1580, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime8 { get; set; } /// /// 时段8 标识 /// - [Property(1612, 8)] + [Property(1208 + 56 * 7 + 336 + 16, 8)] public byte AcFlagOfTime8 { get; set; } + + + /// + /// 时段8 开始时间 时 + /// + [Property(1216 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTime9 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(1224 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTimeMinute9 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(1232 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime9 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(1240 + 56 * 7 + 336 + 16, 8)] + public byte AcFlagOfTime9 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1248 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTime10 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(1256 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTimeMinute10 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(1264 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime10 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(1272 + 56 * 7 + 336 + 16, 8)] + public byte AcFlagOfTime10 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1280 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTime11 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(1288 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTimeMinute11 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(1296 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime11 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(1304 + 56 * 7 + 336 + 16, 8)] + public byte AcFlagOfTime11 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1312 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTime12 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(1320 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTimeMinute12 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(1328 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime12 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(1336 + 56 * 7 + 336 + 16, 8)] + public byte AcFlagOfTime12 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1344 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTime13 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(1352 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTimeMinute13 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(1360 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime13 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(1368 + 56 * 7 + 336 + 16, 8)] + public byte AcFlagOfTime13 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1376 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTime14 { get; set; } + + /// + /// 时段8 开始时间 分 + /// + [Property(1384 + 56 * 7 + 336 + 16, 8)] + public byte AcStartTimeMinute14 { get; set; } + + /// + /// 时段8 电量 + /// + [Property(1392 + 56 * 7 + 336 + 16, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime14 { get; set; } + + /// + /// 时段8 标识 + /// + [Property(1400 + 56 * 7 + 336 + 16, 8)] //2144 + public byte AcFlagOfTime14 { get; set; } + + #endregion } \ No newline at end of file diff --git a/Service/Charger/Msg/Charger/Req/RecordCharge.cs b/Service/Charger/Msg/Charger/Req/RecordCharge.cs index 7f65b9b..c1c0423 100644 --- a/Service/Charger/Msg/Charger/Req/RecordCharge.cs +++ b/Service/Charger/Msg/Charger/Req/RecordCharge.cs @@ -8,7 +8,7 @@ namespace Service.Charger.Msg.Charger.Req public class RecordCharge : ASDU { /// - /// 订单编号 + /// 充电流水号 /// [Property(0, 32, PropertyReadConstant.Byte)] public string ChargerOrderNo { get; set; }