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

fixed PEP8 warnings in API

pull/63/head
13621160019@163.com 2021-08-25 12:01:14 +08:00
parent f39ad7f039
commit b389887b50
17 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myems-aggregation/space_energy_input_category.py
View File

@ -584,7 +584,8 @@ def worker(space):
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc] = dict()
energy_category_id = row_value[1]
actual_value = row_value[2]
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_category_id] = actual_value
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][
energy_category_id] = actual_value
except Exception as e:
error_string = "Error in step 14 of space_energy_input_category.worker " + str(e)
if cursor_energy_db:
@ -769,7 +770,8 @@ def worker(space):
energy_child_space_hourly[child_space_id][current_datetime_utc] = dict()
energy_category_id = row_energy_value[1]
actual_value = row_energy_value[2]
energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] = actual_value
energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] \
= actual_value
except Exception as e:
error_string = "Error in step 19 of space_energy_input_category.worker " + str(e)
if cursor_energy_db:

3
myems-aggregation/space_energy_input_item.py
View File

@ -587,7 +587,8 @@ def worker(space):
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc] = dict()
energy_item_id = row_value[1]
actual_value = row_value[2]
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_item_id] = actual_value
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_item_id] \
= actual_value
except Exception as e:
error_string = "Error in step 14 of space_energy_input_item.worker " + str(e)
if cursor_energy_db:

7
myems-aggregation/space_energy_output_category.py
View File

@ -286,8 +286,8 @@ def worker(space):
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc] = dict()
energy_category_id = row_value[1]
actual_value = row_value[2]
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][energy_category_id] = \
actual_value
energy_combined_equipment_hourly[combined_equipment_id][current_datetime_utc][
energy_category_id] = actual_value
except Exception as e:
error_string = "Error in step 5 of space_energy_output_category.worker " + str(e)
if cursor_energy_db:
@ -361,7 +361,8 @@ def worker(space):
energy_child_space_hourly[child_space_id][current_datetime_utc] = dict()
energy_category_id = row_energy_value[1]
actual_value = row_energy_value[2]
energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] = actual_value
energy_child_space_hourly[child_space_id][current_datetime_utc][energy_category_id] \
= actual_value
except Exception as e:
error_string = "Error in step 7 of space_energy_output_category.worker " + str(e)
if cursor_energy_db:

6
myems-api/app.py
View File

@ -3,9 +3,9 @@ from falcon_cors import CORS
from falcon_multipart.middleware import MultipartMiddleware
from core import energyflowdiagram, privilege, textmessage, distributioncircuit, virtualmeter, \
costcenter, point, knowledgefile, meter, gsmmodem, tariff, user, storetype, timezone, \
costfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, shopfloor, \
webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, offlinemeter, \
rule, energycategory, sensor, energyitem, notification, menu
costfile, offlinemeterfile, version, contact, emailserver, combinedequipment, datasource, equipment, tenant, \
shopfloor, webmessage, distributionsystem, store, emailmessage, tenanttype, wechatmessage, space, gateway, \
offlinemeter, rule, energycategory, sensor, energyitem, notification, menu
from reports import advancedreport
from reports import distributionsystem as distributionsystemreport
from reports import energyflowdiagram as energyflowdiagramreport

3
myems-api/reports/metersubmetersbalance.py
View File

@ -334,7 +334,8 @@ class Reporting:
}
# export result to Excel file and then encode the file to base64 string
result['excel_bytes_base64'] = excelexporters.metersubmetersbalance.export(result,
result['excel_bytes_base64'] = \
excelexporters.metersubmetersbalance.export(result,
master_meter['name'],
reporting_period_start_datetime_local,
reporting_period_end_datetime_local,

7
myems-api/reports/tenantenergycategory.py
View File

@ -554,16 +554,15 @@ class Reporting:
result['reporting_period']['increment_rate_in_kgce'] = \
(result['reporting_period']['total_in_kgce'] - result['base_period']['total_in_kgce']) / \
result['base_period']['total_in_kgce'] \
if result['base_period']['total_in_kgce'] > Decimal(0.0) else None
result['base_period']['total_in_kgce'] if result['base_period']['total_in_kgce'] > Decimal(0.0) else None
result['reporting_period']['total_in_kgce_per_unit_area'] = \
result['reporting_period']['total_in_kgco2e'] / tenant['area'] if tenant['area'] > 0.0 else None
result['reporting_period']['increment_rate_in_kgco2e'] = \
(result['reporting_period']['total_in_kgco2e'] - result['base_period']['total_in_kgco2e']) / \
result['base_period']['total_in_kgco2e'] \
if result['base_period']['total_in_kgco2e'] > Decimal(0.0) else None
result['base_period']['total_in_kgco2e'] if result['base_period']['total_in_kgco2e'] > Decimal(0.0)\
else None
result['parameters'] = {
"names": parameters_data['names'],