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

Merge branch 'develop'

pull/142/MERGE
13621160019@163.com 2022-04-17 20:20:32 +08:00
parent 47d43c6792 ce1ab06770
commit f72488e257
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/virtualmetercarbon.py
View File

@ -245,8 +245,8 @@ class Reporting:
" AND start_datetime_utc >= %s " " AND start_datetime_utc >= %s "
" AND start_datetime_utc < %s " " AND start_datetime_utc < %s "
" ORDER BY start_datetime_utc ") " ORDER BY start_datetime_utc ")
cursor_carbon.execute(query, (virtual_meter['id'], reporting_start_datetime_utc, reporting_end_datetime_utc)) cursor_energy.execute(query, (virtual_meter['id'], reporting_start_datetime_utc, reporting_end_datetime_utc))
rows_virtual_meter_hourly = cursor_carbon.fetchall() rows_virtual_meter_hourly = cursor_energy.fetchall()
rows_virtual_meter_periodically = utilities.aggregate_hourly_data_by_period(rows_virtual_meter_hourly, rows_virtual_meter_periodically = utilities.aggregate_hourly_data_by_period(rows_virtual_meter_hourly,
reporting_start_datetime_utc, reporting_start_datetime_utc,