From be6e74f08b3ba1686d67b5cb974696e0aa5c07a9 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 21 Jan 2022 20:36:35 +0800 Subject: [PATCH] fixed fraction numerator and denominator issue in combinedequipmentefficiency and equipmentefficiency reports --- .../reports/combinedequipmentefficiency.py | 24 +++++++++---------- myems-api/reports/equipmentefficiency.py | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/myems-api/reports/combinedequipmentefficiency.py b/myems-api/reports/combinedequipmentefficiency.py index 54f68c36..0ced68e5 100644 --- a/myems-api/reports/combinedequipmentefficiency.py +++ b/myems-api/reports/combinedequipmentefficiency.py @@ -301,7 +301,7 @@ class Reporting: ################################################################################################################ # get all meters meter_dict = dict() - query = (" SELECT m.id, m.uuid, ec.unit_of_measure " + query = (" SELECT m.uuid, m.id, m.name, ec.unit_of_measure " " FROM tbl_meters m, tbl_energy_categories ec " " WHERE m.energy_category_id = ec.id ") cursor_system.execute(query) @@ -309,10 +309,10 @@ class Reporting: if rows_meters is not None and len(rows_meters) > 0: for row in rows_meters: - meter_dict[row[1]] = {'id': row[0], 'unit': row[2]} + meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]} # get all offline meters offline_meter_dict = dict() - query = (" SELECT m.id, m.uuid, ec.unit_of_measure " + query = (" SELECT m.uuid, m.id, m.name, ec.unit_of_measure " " FROM tbl_offline_meters m, tbl_energy_categories ec " " WHERE m.energy_category_id = ec.id ") cursor_system.execute(query) @@ -320,10 +320,10 @@ class Reporting: if rows_offline_meters is not None and len(rows_offline_meters) > 0: for row in rows_offline_meters: - offline_meter_dict[row[1]] = {'id': row[0], 'unit': row[2]} + offline_meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]} # get all virtual meters virtual_meter_dict = dict() - query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name" + query = (" SELECT m.uuid, m.id, m.name, ec.unit_of_measure " " FROM tbl_virtual_meters m, tbl_energy_categories ec " " WHERE m.energy_category_id = ec.id ") cursor_system.execute(query) @@ -331,39 +331,39 @@ class Reporting: if rows_virtual_meters is not None and len(rows_virtual_meters) > 0: for row in rows_virtual_meters: - virtual_meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]} + virtual_meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]} if fraction_list is not None and len(fraction_list) > 0: for fraction in fraction_list: if fraction['numerator_meter_uuid'] in offline_meter_dict: - fraction['numerator_meter_name'] = offline_meter_dict[fraction['numerator_meter_uuid']]['name'] fraction['numerator_meter_id'] = offline_meter_dict[fraction['numerator_meter_uuid']]['id'] + fraction['numerator_meter_name'] = offline_meter_dict[fraction['numerator_meter_uuid']]['name'] fraction['numerator_meter_unit'] = offline_meter_dict[fraction['numerator_meter_uuid']]['unit'] fraction['numerator_meter_type'] = 'offline_meter' elif fraction['numerator_meter_uuid'] in virtual_meter_dict: - fraction['numerator_meter_name'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['name'] fraction['numerator_meter_id'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['id'] + fraction['numerator_meter_name'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['name'] fraction['numerator_meter_unit'] = virtual_meter_dict[fraction['numerator_meter_uuid']]['unit'] fraction['numerator_meter_type'] = 'virtual_meter' elif fraction['numerator_meter_uuid'] in meter_dict: - fraction['numerator_meter_name'] = meter_dict[fraction['numerator_meter_uuid']]['name'] fraction['numerator_meter_id'] = meter_dict[fraction['numerator_meter_uuid']]['id'] + fraction['numerator_meter_name'] = meter_dict[fraction['numerator_meter_uuid']]['name'] fraction['numerator_meter_unit'] = meter_dict[fraction['numerator_meter_uuid']]['unit'] fraction['numerator_meter_type'] = 'meter' if fraction['denominator_meter_uuid'] in offline_meter_dict: - fraction['denominator_meter_name'] = offline_meter_dict[fraction['denominator_meter_uuid']]['name'] fraction['denominator_meter_id'] = offline_meter_dict[fraction['denominator_meter_uuid']]['id'] + fraction['denominator_meter_name'] = offline_meter_dict[fraction['denominator_meter_uuid']]['name'] fraction['denominator_meter_unit'] = offline_meter_dict[fraction['denominator_meter_uuid']]['unit'] fraction['denominator_meter_type'] = 'offline_meter' elif fraction['denominator_meter_uuid'] in virtual_meter_dict: - fraction['denominator_meter_name'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['name'] fraction['denominator_meter_id'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['id'] + fraction['denominator_meter_name'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['name'] fraction['denominator_meter_unit'] = virtual_meter_dict[fraction['denominator_meter_uuid']]['unit'] fraction['denominator_meter_type'] = 'virtual_meter' elif fraction['denominator_meter_uuid'] in meter_dict: - fraction['denominator_meter_name'] = meter_dict[fraction['denominator_meter_uuid']]['name'] fraction['denominator_meter_id'] = meter_dict[fraction['denominator_meter_uuid']]['id'] + fraction['denominator_meter_name'] = meter_dict[fraction['denominator_meter_uuid']]['name'] fraction['denominator_meter_unit'] = meter_dict[fraction['denominator_meter_uuid']]['unit'] fraction['denominator_meter_type'] = 'meter' diff --git a/myems-api/reports/equipmentefficiency.py b/myems-api/reports/equipmentefficiency.py index 8daad892..7643c4af 100644 --- a/myems-api/reports/equipmentefficiency.py +++ b/myems-api/reports/equipmentefficiency.py @@ -217,7 +217,7 @@ class Reporting: ################################################################################################################ # get all meters meter_dict = dict() - query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name " + query = (" SELECT m.uuid, m.id, m.name, ec.unit_of_measure " " FROM tbl_meters m, tbl_energy_categories ec " " WHERE m.energy_category_id = ec.id ") cursor_system.execute(query) @@ -225,10 +225,10 @@ class Reporting: if rows_meters is not None and len(rows_meters) > 0: for row in rows_meters: - meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]} + meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]} # get all offline meters offline_meter_dict = dict() - query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name " + query = (" SELECT m.uuid, m.id, m.name, ec.unit_of_measure " " FROM tbl_offline_meters m, tbl_energy_categories ec " " WHERE m.energy_category_id = ec.id ") cursor_system.execute(query) @@ -236,10 +236,10 @@ class Reporting: if rows_offline_meters is not None and len(rows_offline_meters) > 0: for row in rows_offline_meters: - offline_meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]} + offline_meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]} # get all virtual meters virtual_meter_dict = dict() - query = (" SELECT m.id, m.uuid, ec.unit_of_measure, ec.name " + query = (" SELECT m.uuid, m.id, m.name, ec.unit_of_measure " " FROM tbl_virtual_meters m, tbl_energy_categories ec " " WHERE m.energy_category_id = ec.id ") cursor_system.execute(query) @@ -247,7 +247,7 @@ class Reporting: if rows_virtual_meters is not None and len(rows_virtual_meters) > 0: for row in rows_virtual_meters: - virtual_meter_dict[row[1]] = {'id': row[0], 'unit': row[2], 'name': row[3]} + virtual_meter_dict[row[0]] = {'id': row[1], 'name': row[2], 'unit': row[3]} if fraction_list is not None and len(fraction_list) > 0: for fraction in fraction_list: