diff --git a/Service/Charger/Handler/RecordChargeHandler.cs b/Service/Charger/Handler/RecordChargeHandler.cs index 8252886..269de88 100644 --- a/Service/Charger/Handler/RecordChargeHandler.cs +++ b/Service/Charger/Handler/RecordChargeHandler.cs @@ -52,6 +52,12 @@ namespace Service.Charger.Handler 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;} @@ -62,6 +68,12 @@ namespace Service.Charger.Handler 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;} client.ChargeOrderNo = msg.ChargerOrderNo; diff --git a/Service/Charger/Msg/Charger/Req/RecordCharge.cs b/Service/Charger/Msg/Charger/Req/RecordCharge.cs index 923b464..7f65b9b 100644 --- a/Service/Charger/Msg/Charger/Req/RecordCharge.cs +++ b/Service/Charger/Msg/Charger/Req/RecordCharge.cs @@ -337,50 +337,176 @@ namespace Service.Charger.Msg.Charger.Req [Property(584 + 56 * 7, 8)] public byte FlagOfTime8 { get; set; } + /// + /// 时段8 开始时间 时 + /// + [Property(592 + 56 * 7, 8)] + public byte StartTime9 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(600 + 56 * 7, 8)] + public byte StartTimeMinute9 { get; set; } + /// + /// 时段8 电量 + /// + [Property(608 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime9 { get; set; } + /// + /// 时段8 标识 + /// + [Property(640 + 56 * 7, 8)] + public byte FlagOfTime9 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(648 + 56 * 7, 8)] + public byte StartTime10 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(656 + 56 * 7, 8)] + public byte StartTimeMinute10 { get; set; } + /// + /// 时段8 电量 + /// + [Property(664 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime10 { get; set; } + /// + /// 时段8 标识 + /// + [Property(696 + 56 * 7, 8)] + public byte FlagOfTime10 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(704 + 56 * 7, 8)] + public byte StartTime11 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(712 + 56 * 7, 8)] + public byte StartTimeMinute11 { get; set; } + /// + /// 时段8 电量 + /// + [Property(720 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime11 { get; set; } + /// + /// 时段8 标识 + /// + [Property(752 + 56 * 7, 8)] + public byte FlagOfTime11 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(760 + 56 * 7, 8)] + public byte StartTime12 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(768 + 56 * 7, 8)] + public byte StartTimeMinute12 { get; set; } + /// + /// 时段8 电量 + /// + [Property(776 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime12 { get; set; } + /// + /// 时段8 标识 + /// + [Property(808 + 56 * 7, 8)] + public byte FlagOfTime12 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(816 + 56 * 7, 8)] + public byte StartTime13 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(824 + 56 * 7, 8)] + public byte StartTimeMinute13 { get; set; } + /// + /// 时段8 电量 + /// + [Property(832 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime13 { get; set; } + /// + /// 时段8 标识 + /// + [Property(864 + 56 * 7, 8)] + public byte FlagOfTime13 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(872 + 56 * 7, 8)] + public byte StartTime14 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(880 + 56 * 7, 8)] + public byte StartTimeMinute14 { get; set; } + /// + /// 时段8 电量 + /// + [Property(888 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float ChargingPowerOfTime14 { get; set; } + /// + /// 时段8 标识 + /// + [Property(920 + 56 * 7, 8)] + public byte FlagOfTime14 { get; set; } + #endregion /// /// 充电模式 0:站内充电 1:站外充电 /// - [Property(984, 8)] + [Property(984 + 336, 8)] public byte ChargeMode { get; set; } /// /// 启动模式 0: 站控启动 1:本地启动 /// - [Property(992, 8)] + [Property(992 + 336, 8)] public byte StartMode { get; set; } /// /// 充电前直流表值 /// - [Property(1000, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1000 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float DcMeterDataBefore { get; set; } /// /// 充电后直流表值 /// - [Property(1032, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1032 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float DcMeterDataAfter { get; set; } /// /// 充电前交流表值 /// - [Property(1064, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1064 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcMeterDataBefore { get; set; } /// /// 充电后交流表值 /// - [Property(1096, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1096 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcMeterDataAfter { get; set; } /// /// 交流表充电量 /// - [Property(1128, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1128 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcMeterElecCount { get; set; } #region 交流峰谷电 @@ -388,195 +514,324 @@ namespace Service.Charger.Msg.Charger.Req /// /// 时段1 开始时间 时 /// - [Property(1160, 8)] + [Property(1160 + 336, 8)] public byte AcStartTime1 { get; set; } /// /// 时段1 开始时间 分 /// - [Property(1168, 8)] + [Property(1168 + 336, 8)] public byte AcStartTimeMinute1 { get; set; } /// /// 时段1 电量 /// - [Property(1176, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime1 { get; set; } /// /// 时段1 标识 /// - [Property(1208, 8)] + [Property(1208 + 336, 8)] public byte AcFlagOfTime1 { get; set; } /// /// 时段2 开始时间 时 /// - [Property(1160 + 56, 8)] + [Property(1160 + 56 + 336, 8)] public byte AcStartTime2 { get; set; } /// /// 时段2 开始时间 分 /// - [Property(1168 + 56, 8)] + [Property(1168 + 56 + 336, 8)] public byte AcStartTimeMinute2 { get; set; } /// /// 时段2 电量 /// - [Property(1176 + 56, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime2 { get; set; } /// /// 时段2 标识 /// - [Property(1208 + 56, 8)] + [Property(1208 + 56 + 336, 8)] public byte AcFlagOfTime2 { get; set; } /// /// 时段3 开始时间 时 /// - [Property(1160 + 56 * 2, 8)] + [Property(1160 + 56 * 2 + 336, 8)] public byte AcStartTime3 { get; set; } /// /// 时段3 开始时间 分 /// - [Property(1168 + 56 * 2, 8)] + [Property(1168 + 56 * 2 + 336, 8)] public byte AcStartTimeMinute3 { get; set; } /// /// 时段3 电量 /// - [Property(1176 + 56 * 2, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 2 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime3 { get; set; } /// /// 时段3 标识 /// - [Property(1208 + 56 * 2, 8)] + [Property(1208 + 56 * 2 + 336, 8)] public byte AcFlagOfTime3 { get; set; } /// /// 时段4 开始时间 时 /// - [Property(1160 + 56 * 3, 8)] + [Property(1160 + 56 * 3 + 336, 8)] public byte AcStartTime4 { get; set; } /// /// 时段4 开始时间 分 /// - [Property(1168 + 56 * 3, 8)] + [Property(1168 + 56 * 3 + 336, 8)] public byte AcStartTimeMinute4 { get; set; } /// /// 时段4 电量 /// - [Property(1176 + 56 * 3, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 3 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime4 { get; set; } /// /// 时段4 标识 /// - [Property(1208 + 56 * 3, 8)] + [Property(1208 + 56 * 3 + 336, 8)] public byte AcFlagOfTime4 { get; set; } /// /// 时段5 开始时间 时 /// - [Property(1160 + 56 * 4, 8)] + [Property(1160 + 56 * 4 + 336, 8)] public byte AcStartTime5 { get; set; } /// /// 时段5 开始时间 分 /// - [Property(1168 + 56 * 4, 8)] + [Property(1168 + 56 * 4 + 336, 8)] public byte AcStartTimeMinute5 { get; set; } /// /// 时段5 电量 /// - [Property(1176 + 56 * 4, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 4 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime5 { get; set; } /// /// 时段5 标识 /// - [Property(1208 + 56 * 4, 8)] + [Property(1208 + 56 * 4 + 336, 8)] public byte AcFlagOfTime5 { get; set; } /// /// 时段6 开始时间 时 /// - [Property(1160 + 56 * 5, 8)] + [Property(1160 + 56 * 5 + 336, 8)] public byte AcStartTime6 { get; set; } /// /// 时段6 开始时间 分 /// - [Property(1168 + 56 * 5, 8)] + [Property(1168 + 56 * 5 + 336, 8)] public byte AcStartTimeMinute6 { get; set; } /// /// 时段6 电量 /// - [Property(1176 + 56 * 5, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 5 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime6 { get; set; } /// /// 时段6 标识 /// - [Property(1208 + 56 * 5, 8)] + [Property(1208 + 56 * 5 + 336, 8)] public byte AcFlagOfTime6 { get; set; } /// /// 时段7 开始时间 时 /// - [Property(1160 + 56 * 6, 8)] + [Property(1160 + 56 * 6 + 336, 8)] public byte AcStartTime7 { get; set; } /// /// 时段7 开始时间 分 /// - [Property(1168 + 56 * 6, 8)] + [Property(1168 + 56 * 6 + 336, 8)] public byte AcStartTimeMinute7 { get; set; } /// /// 时段7 电量 /// - [Property(1176 + 56 * 6, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 6 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime7 { get; set; } /// /// 时段7 标识 /// - [Property(1208 + 56 * 6, 8)] + [Property(1208 + 56 * 6 + 336, 8)] public byte AcFlagOfTime7 { get; set; } /// /// 时段8 开始时间 时 /// - [Property(1160 + 56 * 7, 8)] + [Property(1160 + 56 * 7 + 336, 8)] public byte AcStartTime8 { get; set; } /// /// 时段8 开始时间 分 /// - [Property(1168 + 56 * 7, 8)] + [Property(1168 + 56 * 7 + 336, 8)] public byte AcStartTimeMinute8 { get; set; } /// /// 时段8 电量 /// - [Property(1176 + 56 * 7, 32, PropertyReadConstant.Bit, 0.01, 2)] + [Property(1176 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] public float AcChargingPowerOfTime8 { get; set; } /// /// 时段8 标识 /// - [Property(1208 + 56 * 7, 8)] + [Property(1208 + 56 * 7 + 336, 8)] public byte AcFlagOfTime8 { get; set; } + + + /// + /// 时段8 开始时间 时 + /// + [Property(1216 + 56 * 7 + 336, 8)] + public byte AcStartTime9 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(1224 + 56 * 7 + 336, 8)] + public byte AcStartTimeMinute9 { get; set; } + /// + /// 时段8 电量 + /// + [Property(1232 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime9 { get; set; } + /// + /// 时段8 标识 + /// + [Property(1240 + 56 * 7 + 336, 8)] + public byte AcFlagOfTime9 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1248 + 56 * 7 + 336, 8)] + public byte AcStartTime10 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(1256 + 56 * 7 + 336, 8)] + public byte AcStartTimeMinute10 { get; set; } + /// + /// 时段8 电量 + /// + [Property(1264 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime10 { get; set; } + /// + /// 时段8 标识 + /// + [Property(1272 + 56 * 7 + 336, 8)] + public byte AcFlagOfTime10 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1280 + 56 * 7 + 336, 8)] + public byte AcStartTime11 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(1288 + 56 * 7 + 336, 8)] + public byte AcStartTimeMinute11 { get; set; } + /// + /// 时段8 电量 + /// + [Property(1296 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime11 { get; set; } + /// + /// 时段8 标识 + /// + [Property(1304 + 56 * 7 + 336, 8)] + public byte AcFlagOfTime11 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1312 + 56 * 7 + 336, 8)] + public byte AcStartTime12 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(1320 + 56 * 7 + 336, 8)] + public byte AcStartTimeMinute12 { get; set; } + /// + /// 时段8 电量 + /// + [Property(1328 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime12 { get; set; } + /// + /// 时段8 标识 + /// + [Property(1336 + 56 * 7 + 336, 8)] + public byte AcFlagOfTime12 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1344 + 56 * 7 + 336, 8)] + public byte AcStartTime13 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(1352 + 56 * 7 + 336, 8)] + public byte AcStartTimeMinute13 { get; set; } + /// + /// 时段8 电量 + /// + [Property(1360 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime13 { get; set; } + /// + /// 时段8 标识 + /// + [Property(1368 + 56 * 7 + 336, 8)] + public byte AcFlagOfTime13 { get; set; } + + /// + /// 时段8 开始时间 时 + /// + [Property(1376 + 56 * 7 + 336, 8)] + public byte AcStartTime14 { get; set; } + /// + /// 时段8 开始时间 分 + /// + [Property(1384 + 56 * 7 + 336, 8)] + public byte AcStartTimeMinute14 { get; set; } + /// + /// 时段8 电量 + /// + [Property(1392 + 56 * 7 + 336, 32, PropertyReadConstant.Bit, 0.01, 2)] + public float AcChargingPowerOfTime14 { get; set; } + /// + /// 时段8 标识 + /// + [Property(1400 + 56 * 7 + 336, 8)] + public byte AcFlagOfTime14 { get; set; } + + #endregion } } \ No newline at end of file diff --git a/Service/Charger/Msg/Host/Req/SetPeakValleyTime.cs b/Service/Charger/Msg/Host/Req/SetPeakValleyTime.cs index 4d4c943..efddac5 100644 --- a/Service/Charger/Msg/Host/Req/SetPeakValleyTime.cs +++ b/Service/Charger/Msg/Host/Req/SetPeakValleyTime.cs @@ -165,6 +165,102 @@ namespace Service.Charger.Msg.Host.Req [Property(200, 8)] public byte TimePeak8 { get; set; } + /// + /// 时段9开始时间 + /// + [Property(208, 8)] + public byte StartHH9 { get; set; } + /// + /// 时段9开始时间 + /// + [Property(216, 8)] + public byte StartMM9 { get; set; } + /// + /// 时段9尖峰标识 1尖 2峰 3平 4谷 + /// + [Property(224, 8)] + public byte TimePeak9 { get; set; } + + /// + /// 时段10开始时间 + /// + [Property(232, 8)] + public byte StartHH10 { get; set; } + /// + /// 时段10开始时间 + /// + [Property(240, 8)] + public byte StartMM10 { get; set; } + /// + /// 时段10尖峰标识 1尖 2峰 3平 4谷 + /// + [Property(248, 8)] + public byte TimePeak10 { get; set; } + + /// + /// 时段11开始时间 + /// + [Property(256, 8)] + public byte StartHH11 { get; set; } + /// + /// 时段11开始时间 + /// + [Property(264, 8)] + public byte StartMM11 { get; set; } + /// + /// 时段11尖峰标识 1尖 2峰 3平 4谷 + /// + [Property(272, 8)] + public byte TimePeak11 { get; set; } + + /// + /// 时段12开始时间 + /// + [Property(280, 8)] + public byte StartHH12 { get; set; } + /// + /// 时段12开始时间 + /// + [Property(288, 8)] + public byte StartMM12 { get; set; } + /// + /// 时段12尖峰标识 1尖 2峰 3平 4谷 + /// + [Property(296, 8)] + public byte TimePeak12 { get; set; } + + /// + /// 时段13开始时间 + /// + [Property(314, 8)] + public byte StartHH13 { get; set; } + /// + /// 时段13开始时间 + /// + [Property(322, 8)] + public byte StartMM13 { get; set; } + /// + /// 时段13尖峰标识 1尖 2峰 3平 4谷 + /// + [Property(330, 8)] + public byte TimePeak13 { get; set; } + + /// + /// 时段14开始时间 + /// + [Property(338, 8)] + public byte StartHH14 { get; set; } + /// + /// 时段14开始时间 + /// + [Property(346, 8)] + public byte StartMM14 { get; set; } + /// + /// 时段14尖峰标识 1尖 2峰 3平 4谷 + /// + [Property(354, 8)] + public byte TimePeak14 { get; set; } + public SetPeakValleyTime() { FrameTypeNo = 45;