diff --git a/myems-normalization/offlinemeter.py b/myems-normalization/offlinemeter.py index 8bb0a8a2..6a818f55 100644 --- a/myems-normalization/offlinemeter.py +++ b/myems-normalization/offlinemeter.py @@ -176,7 +176,7 @@ def calculate_hourly(logger): continue try: - cursor.execute(" SELECT id, name " + cursor.execute(" SELECT id, name, hourly_low_limit, hourly_high_limit" " FROM tbl_offline_meters ") rows_offline_meters = cursor.fetchall() except Exception as e: @@ -204,6 +204,17 @@ def calculate_hourly(logger): is_valid_file = False break + for row_offline_meter in rows_offline_meters: + if row_offline_meter[0] == energy_data_item['offline_meter_id']: + for key in energy_data_item['data']: + if row_offline_meter[2] > (energy_data_item['data'][key]/24): + is_valid_file = False + break + elif row_offline_meter[3] < (energy_data_item['data'][key]/24): + is_valid_file = False + break + break + if is_valid_file: #################################################################################################### # delete possibly exists offline meter hourly data in myems energy database,