added validation of offline meter hourly values to myems-normalization service
Merge branch 'PR75' into developpull/78/head
commit
a5e0871def
Binary file not shown.
|
@ -176,7 +176,7 @@ def calculate_hourly(logger):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
cursor.execute(" SELECT id, name "
|
cursor.execute(" SELECT id, name, hourly_low_limit, hourly_high_limit"
|
||||||
" FROM tbl_offline_meters ")
|
" FROM tbl_offline_meters ")
|
||||||
rows_offline_meters = cursor.fetchall()
|
rows_offline_meters = cursor.fetchall()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
@ -204,6 +204,17 @@ def calculate_hourly(logger):
|
||||||
is_valid_file = False
|
is_valid_file = False
|
||||||
break
|
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:
|
if is_valid_file:
|
||||||
####################################################################################################
|
####################################################################################################
|
||||||
# delete possibly exists offline meter hourly data in myems energy database,
|
# delete possibly exists offline meter hourly data in myems energy database,
|
||||||
|
|
Loading…
Reference in New Issue