diff --git a/Download Faturas/Fatura.cs b/Download Faturas/Fatura.cs index ae22265..bbb6833 100644 --- a/Download Faturas/Fatura.cs +++ b/Download Faturas/Fatura.cs @@ -393,28 +393,28 @@ switch (measuredItem.type, measuredItem.period) { case ("demand", "peak"): - dem_Reg_P = measuredItem.measured; + dem_Reg_P = measuredItem.measured.Max(); break; case ("demand", "off-peak"): - dem_Reg_FP = measuredItem.measured; + dem_Reg_FP = measuredItem.measured.Max(); break; case ("energy", "off-peak"): - consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; + consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum(); break; case ("energy", "off-peak inductive"): - consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; + consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum(); break; case ("energy", "off-peak capacitive"): - consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; + consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum(); break; case ("energy", "off-peak capacitive green flag"): - consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; + consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum(); break; case ("energy", "off-peak inductive green flag"): - consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; + consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum(); break; case ("energy", "reserved"): - consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; + consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum(); break; } } diff --git a/Download Faturas/Rootobject.cs b/Download Faturas/Rootobject.cs index 7d8e58e..0922b6a 100644 --- a/Download Faturas/Rootobject.cs +++ b/Download Faturas/Rootobject.cs @@ -1,5 +1,7 @@ namespace Download_Faturas { + using System.Text.Json.Serialization; + #pragma warning disable CS8618, SA1300, SA1402 public class Rootobject { @@ -101,7 +103,8 @@ public string[] texts { get; set; } - public float measured { get; set; } + [JsonConverter(typeof(FloatArrayOrSingleConverter))] + public float[] measured { get; set; } } public class Item