Merge branch 'develop'

pull/121/MERGE
13621160019@163.com 2022-01-28 13:44:47 +08:00
commit 145d80cf38
2 changed files with 2 additions and 2 deletions

View File

@ -152,7 +152,7 @@ def main():
Process(target=tenant_energy_input_item.main, args=(logger,)).start()
# virtual meter carbon dioxide emission
Process(target=virtual_meter_billing.main, args=(logger,)).start()
Process(target=virtual_meter_carbon.main, args=(logger,)).start()
# virtual meter billing (cost or income)
Process(target=virtual_meter_billing.main, args=(logger,)).start()

View File

@ -135,7 +135,7 @@ def main(logger):
try:
cursor_carbon_db.execute(" SELECT MAX(start_datetime_utc) "
" FROM tbl_virtual_meter_hourly "
" WHERE meter_id = %s ",
" WHERE virtual_meter_id = %s ",
(virtual_meter['id'], ))
row_datetime = cursor_carbon_db.fetchone()
start_datetime_utc = datetime.strptime(config.start_datetime_utc, '%Y-%m-%d %H:%M:%S')