Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@nengyuanzhang
nengyuanzhang committed Jun 24, 2024
2 parents c127bfa + e941681 commit 7c1c917
Showing 1 changed file with 39 additions and 2 deletions.
41 changes: 39 additions & 2 deletions myems-api/reports/energystoragepowerstationcollectionenergy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ def on_get(req, resp):
timezone_offset = -timezone_offset
reporting = dict()
reporting['charge_7_days'] = dict()
reporting['charge_this_month'] = dict()
reporting['charge_this_year'] = dict()
reporting['discharge_7_days'] = dict()
reporting['charge_this_month'] = dict()
reporting['discharge_this_month'] = dict()
reporting['charge_this_year'] = dict()
reporting['discharge_this_year'] = dict()

end_datetime_utc = datetime.utcnow()
Expand All @@ -121,6 +121,7 @@ def on_get(req, resp):
reporting['charge_7_days'] = dict()
reporting['charge_7_days']['timestamps_array'] = list()
reporting['charge_7_days']['values_array'] = list()
reporting['charge_7_days']['total_values'] = list()

for energy_storage_power_station in energy_storage_power_station_list:
timestamps = list()
Expand Down Expand Up @@ -157,12 +158,19 @@ def on_get(req, resp):
values.append(actual_value)
reporting['charge_7_days']['timestamps_array'].append(timestamps)
reporting['charge_7_days']['values_array'].append(values)
for i in range(len(values)):
if len(reporting['charge_7_days']['total_values']) <= i:
reporting['charge_7_days']['total_values'].append(Decimal(0.0))
else:
reporting['charge_7_days']['total_values'][i] += values[i]

################################################################################################################
# Step 4: query discharge energy data in 7 days
################################################################################################################
reporting['discharge_7_days'] = dict()
reporting['discharge_7_days']['timestamps_array'] = list()
reporting['discharge_7_days']['values_array'] = list()
reporting['discharge_7_days']['total_values'] = list()
for energy_storage_power_station in energy_storage_power_station_list:
timestamps = list()
values = list()
Expand Down Expand Up @@ -199,6 +207,11 @@ def on_get(req, resp):
values.append(actual_value)
reporting['discharge_7_days']['timestamps_array'].append(timestamps)
reporting['discharge_7_days']['values_array'].append(values)
for i in range(len(values)):
if len(reporting['discharge_7_days']['total_values']) <= i:
reporting['discharge_7_days']['total_values'].append(Decimal(0.0))
else:
reporting['discharge_7_days']['total_values'][i] += values[i]

################################################################################################################
# Step 5: query charge energy data in this month
Expand All @@ -216,6 +229,7 @@ def on_get(req, resp):
reporting['charge_this_month'] = dict()
reporting['charge_this_month']['timestamps_array'] = list()
reporting['charge_this_month']['values_array'] = list()
reporting['charge_this_month']['total_values'] = list()

for energy_storage_power_station in energy_storage_power_station_list:
timestamps = list()
Expand Down Expand Up @@ -253,13 +267,19 @@ def on_get(req, resp):
values.append(actual_value)
reporting['charge_this_month']['timestamps_array'].append(timestamps)
reporting['charge_this_month']['values_array'].append(values)
for i in range(len(values)):
if len(reporting['charge_this_month']['total_values']) <= i:
reporting['charge_this_month']['total_values'].append(Decimal(0.0))
else:
reporting['charge_this_month']['total_values'][i] += values[i]

################################################################################################################
# Step 6: query discharge energy data in this month
################################################################################################################
reporting['discharge_this_month'] = dict()
reporting['discharge_this_month']['timestamps_array'] = list()
reporting['discharge_this_month']['values_array'] = list()
reporting['discharge_this_month']['total_values'] = list()

for energy_storage_power_station in energy_storage_power_station_list:
timestamps = list()
Expand Down Expand Up @@ -297,6 +317,11 @@ def on_get(req, resp):
values.append(actual_value)
reporting['discharge_this_month']['timestamps_array'].append(timestamps)
reporting['discharge_this_month']['values_array'].append(values)
for i in range(len(values)):
if len(reporting['discharge_this_month']['total_values']) <= i:
reporting['discharge_this_month']['total_values'].append(Decimal(0.0))
else:
reporting['discharge_this_month']['total_values'][i] += values[i]

################################################################################################################
# Step 7: query charge energy data in this year
Expand All @@ -314,6 +339,7 @@ def on_get(req, resp):
reporting['charge_this_year'] = dict()
reporting['charge_this_year']['timestamps_array'] = list()
reporting['charge_this_year']['values_array'] = list()
reporting['charge_this_year']['total_values'] = list()

for energy_storage_power_station in energy_storage_power_station_list:
timestamps = list()
Expand Down Expand Up @@ -350,13 +376,19 @@ def on_get(req, resp):
values.append(actual_value)
reporting['charge_this_year']['timestamps_array'].append(timestamps)
reporting['charge_this_year']['values_array'].append(values)
for i in range(len(values)):
if len(reporting['charge_this_year']['total_values']) <= i:
reporting['charge_this_year']['total_values'].append(Decimal(0.0))
else:
reporting['charge_this_year']['total_values'][i] += values[i]

################################################################################################################
# Step 8: query discharge energy data in this month
################################################################################################################
reporting['discharge_this_year'] = dict()
reporting['discharge_this_year']['timestamps_array'] = list()
reporting['discharge_this_year']['values_array'] = list()
reporting['discharge_this_year']['total_values'] = list()

for energy_storage_power_station in energy_storage_power_station_list:
timestamps = list()
Expand Down Expand Up @@ -393,6 +425,11 @@ def on_get(req, resp):
values.append(actual_value)
reporting['discharge_this_year']['timestamps_array'].append(timestamps)
reporting['discharge_this_year']['values_array'].append(values)
for i in range(len(values)):
if len(reporting['discharge_this_year']['total_values']) <= i:
reporting['discharge_this_year']['total_values'].append(Decimal(0.0))
else:
reporting['discharge_this_year']['total_values'][i] += values[i]

################################################################################################################
# Step 9: construct the report
Expand Down

0 comments on commit 7c1c917

Please sign in to comment.