Smart/faturas_4docs
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adaptado para unidades com mais de um medidor no mesmo mês.

Browse Source
This commit is contained in:
Adriano Serighelli 2024-12-11 09:45:06 -03:00
parent 5a019cddec
commit ee2608859c
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Download Faturas/Fatura.cs
View File

@ -393,28 +393,28 @@
switch (measuredItem.type, measuredItem.period) switch (measuredItem.type, measuredItem.period)
{ {
case ("demand", "peak"): case ("demand", "peak"):
dem_Reg_P = measuredItem.measured; dem_Reg_P = measuredItem.measured.Max();
break; break;
case ("demand", "off-peak"): case ("demand", "off-peak"):
dem_Reg_FP = measuredItem.measured; dem_Reg_FP = measuredItem.measured.Max();
break; break;
case ("energy", "off-peak"): case ("energy", "off-peak"):
consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum();
break; break;
case ("energy", "off-peak inductive"): 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; break;
case ("energy", "off-peak capacitive"): 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; break;
case ("energy", "off-peak capacitive green flag"): 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; break;
case ("energy", "off-peak inductive green flag"): 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; break;
case ("energy", "reserved"): case ("energy", "reserved"):
consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured; consumo_Reg_FP = consumo_Reg_FP.GetValueOrDefault() + measuredItem.measured.Sum();
break; break;
} }
} }

5
Download Faturas/Rootobject.cs
View File

@ -1,5 +1,7 @@
namespace Download_Faturas namespace Download_Faturas
{ {
using System.Text.Json.Serialization;
#pragma warning disable CS8618, SA1300, SA1402 #pragma warning disable CS8618, SA1300, SA1402
public class Rootobject public class Rootobject
{ {
@ -101,7 +103,8 @@
public string[] texts { get; set; } public string[] texts { get; set; }
public float measured { get; set; } [JsonConverter(typeof(FloatArrayOrSingleConverter))]
public float[] measured { get; set; }
} }
public class Item public class Item