seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin_myems/develop' into develop

pull/1/head
hyh123a 2021-02-28 22:16:07 +08:00
parent 1fe0b5ba1b 6ab2ac36cf
commit 73a7760575
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
myems-api/reports/energyflowdiagram.py
View File

@ -227,7 +227,7 @@ class Reporting:
elif meta_result['links'][x]['meter']['type'] == 'offline_meter':
query = (" SELECT SUM(actual_value) "
" FROM tbl_offline_meter_hourly "
" WHERE meter_id = %s "
" WHERE offline_meter_id = %s "
" AND start_datetime_utc >= %s "
" AND start_datetime_utc < %s ")
cursor_energy.execute(query, (meta_result['links'][x]['meter']['id'],
@ -239,7 +239,7 @@ class Reporting:
elif meta_result['links'][x]['meter']['type'] == 'virtual_meter':
query = (" SELECT SUM(actual_value) "
" FROM tbl_virtual_meter_hourly "
" WHERE meter_id = %s "
" WHERE virtual_meter_id = %s "
" AND start_datetime_utc >= %s "
" AND start_datetime_utc < %s ")
cursor_energy.execute(query, (meta_result['links'][x]['meter']['id'],