zdzichu/ha-addon-energa-meter-gh-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modified: srcdev/moj_licznik.py

Browse Source
This commit is contained in:
TC
2023-11-03 21:54:51 +01:00
parent 103d6458a8
commit d08a220394
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
srcdev/1database.sqlite Normal file
View File

Binary file not shown.

18
srcdev/moj_licznik.py
View File

@@ -304,7 +304,7 @@ class MojLicznik:
cn.measurement_date = c['measurement_date'] cn.measurement_date = c['measurement_date']
cn.save() cn.save()
logger.info(f"Zapisano stan licznika {c['meter_type']} taryfa {c['tariff']} z dnia: {c['measurement_date']} : {c['meter_value']}") logger.info(f"Zapisano stan licznika {p.id} {c['meter_type']} taryfa {c['tariff']} z dnia: {c['measurement_date']} : {c['meter_value']}")
except HTTPError as e: except HTTPError as e:
logger.error(f"Wystąpił błąd HTTP: {e}") logger.error(f"Wystąpił błąd HTTP: {e}")
@@ -355,19 +355,20 @@ class MojLicznik:
meter.first_date = first_date meter.first_date = first_date
meter.save() meter.save()
def save_main_charts(self, mp, vals, meter_type): def save_main_charts(self, mp, vals, m_type):
for val in vals: for val in vals:
#try: #try:
logger.info(f"save_main_charts: mp: {mp}, val: {val}, meter_type: {m_type}")
z = val["zones"] z = val["zones"]
if z[0]: if z[0]:
# MainChartTable.get_or_create(tm = val["tm"], zone = 1, value = z[0], tarAvg=val["tarAvg"], est=val["est"], cplt=val["cplt"]) # MainChartTable.get_or_create(tm = val["tm"], zone = 1, value = z[0], tarAvg=val["tarAvg"], est=val["est"], cplt=val["cplt"])
try: try:
existing_record = MainChartTable.get((MainChartTable.meter_type == meter_type) & (MainChartTable.mp == mp) & (MainChartTable.tm == val["tm"]) & (MainChartTable.zone == 1)) existing_record = MainChartTable.get((MainChartTable.meter_type == m_type) & (MainChartTable.mp == mp) & (MainChartTable.tm == val["tm"]) & (MainChartTable.zone == 1))
except MainChartTable.DoesNotExist: except MainChartTable.DoesNotExist:
# Jeśli rekord nie istnieje, utwórz nowy # Jeśli rekord nie istnieje, utwórz nowy
MainChartTable.create( MainChartTable.create(
mp=mp, mp=mp,
meter_type=meter_type, meter_type=m_type,
tm=val["tm"], tm=val["tm"],
zone=1, zone=1,
value=z[0], value=z[0],
@@ -378,12 +379,12 @@ class MojLicznik:
if z[1]: if z[1]:
try: try:
existing_record = MainChartTable.get((MainChartTable.meter_type == meter_type) & (MainChartTable.mp == mp) & (MainChartTable.tm == val["tm"]) & (MainChartTable.zone == 2)) existing_record = MainChartTable.get((MainChartTable.meter_type == m_type) & (MainChartTable.mp == mp) & (MainChartTable.tm == val["tm"]) & (MainChartTable.zone == 2))
except MainChartTable.DoesNotExist: except MainChartTable.DoesNotExist:
# Jeśli rekord nie istnieje, utwórz nowy # Jeśli rekord nie istnieje, utwórz nowy
MainChartTable.create( MainChartTable.create(
mp=mp, mp=mp,
meter_type=meter_type, meter_type=m_type,
tm=val["tm"], tm=val["tm"],
zone=2, zone=2,
value=z[1], value=z[1],
@@ -394,12 +395,12 @@ class MojLicznik:
if z[2]: if z[2]:
try: try:
existing_record = MainChartTable.get((MainChartTable.meter_type == meter_type) & (MainChartTable.mp == mp) & (MainChartTable.tm == val["tm"]) & (MainChartTable.zone == 1)) existing_record = MainChartTable.get((MainChartTable.meter_type == m_type) & (MainChartTable.mp == mp) & (MainChartTable.tm == val["tm"]) & (MainChartTable.zone == 3))
except MainChartTable.DoesNotExist: except MainChartTable.DoesNotExist:
# Jeśli rekord nie istnieje, utwórz nowy # Jeśli rekord nie istnieje, utwórz nowy
MainChartTable.create( MainChartTable.create(
mp=mp, mp=mp,
meter_type=meter_type, meter_type=m_type,
tm=val["tm"], tm=val["tm"],
zone=3, zone=3,
value=z[2], value=z[2],
@@ -432,6 +433,7 @@ class MojLicznik:
# meter_type = 'A+' # meter_type = 'A+'
chart_url = f"{self.meter_url}/dp/resources/chart?mainChartDate={tsm_date}&type={chart_type}&meterPoint={meter_point}&mo={urllib.parse.quote_plus(meter_type)}" chart_url = f"{self.meter_url}/dp/resources/chart?mainChartDate={tsm_date}&type={chart_type}&meterPoint={meter_point}&mo={urllib.parse.quote_plus(meter_type)}"
logger.info(f"chart_url: {chart_url}")
try: try:
response = self.session.get(chart_url) response = self.session.get(chart_url)
data = json.loads(response.text) data = json.loads(response.text)