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

Add 'quick_mode variable is used to speed up

pull/26/head
YangZhang-GitHub 2021-04-01 15:23:09 +08:00
parent 0c75dc4db8
commit 8279c4ba7a
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
myems-api/reports/metertrend.py
View File

@ -31,6 +31,7 @@ class Reporting:
meter_id = req.params.get('meterid') meter_id = req.params.get('meterid')
reporting_period_start_datetime_local = req.params.get('reportingperiodstartdatetime') reporting_period_start_datetime_local = req.params.get('reportingperiodstartdatetime')
reporting_period_end_datetime_local = req.params.get('reportingperiodenddatetime') reporting_period_end_datetime_local = req.params.get('reportingperiodenddatetime')
quick_mode = req.params.get('quickmode')
################################################################################################################ ################################################################################################################
# Step 1: valid parameters # Step 1: valid parameters
@ -78,6 +79,13 @@ class Reporting:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_REPORTING_PERIOD_END_DATETIME') description='API.INVALID_REPORTING_PERIOD_END_DATETIME')
# if turn quick mode on, do not return parameters data and excel file
is_quick_mode = False
if quick_mode is not None and \
len(str.strip(quick_mode)) > 0 and \
str.lower(str.strip(quick_mode)) in ('true', 't', 'on', 'yes', 'y'):
is_quick_mode = True
################################################################################################################ ################################################################################################################
# Step 2: query the meter and energy category # Step 2: query the meter and energy category
################################################################################################################ ################################################################################################################
@ -136,6 +144,9 @@ class Reporting:
reporting['values'] = list() reporting['values'] = list()
for point in point_list: for point in point_list:
if is_quick_mode and point['object_type'] != 'ENERGY_VALUE':
continue
point_values = [] point_values = []
point_timestamps = [] point_timestamps = []
if point['object_type'] == 'ANALOG_VALUE': if point['object_type'] == 'ANALOG_VALUE':
@ -204,7 +215,7 @@ class Reporting:
parameters_data['names'] = list() parameters_data['names'] = list()
parameters_data['timestamps'] = list() parameters_data['timestamps'] = list()
parameters_data['values'] = list() parameters_data['values'] = list()
if not is_quick_mode:
tariff_dict = utilities.get_energy_category_tariffs(meter['cost_center_id'], tariff_dict = utilities.get_energy_category_tariffs(meter['cost_center_id'],
meter['energy_category_id'], meter['energy_category_id'],
reporting_start_datetime_utc, reporting_start_datetime_utc,
@ -254,8 +265,10 @@ class Reporting:
"timestamps": parameters_data['timestamps'], "timestamps": parameters_data['timestamps'],
"values": parameters_data['values'] "values": parameters_data['values']
}, },
"excel_bytes_base64": None
} }
# export result to Excel file and then encode the file to base64 string # export result to Excel file and then encode the file to base64 string
if not is_quick_mode:
result['excel_bytes_base64'] = excelexporters.metertrend.export(result, result['excel_bytes_base64'] = excelexporters.metertrend.export(result,
meter['name'], meter['name'],
reporting_period_start_datetime_local, reporting_period_start_datetime_local,