leguadmin/xbackend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
wuaho 2021-09-02 18:35:12 +08:00
parent ad69d6fddf
commit 470fd8fb34
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/api_v1/endpoints/query.py
View File

@ -136,7 +136,7 @@ async def event_model(
# df_group.reset_index(drop=True, inplace=True) # df_group.reset_index(drop=True, inplace=True)
q['groups'].append(groupby) q['groups'].append(groupby)
q['values'].append(df['values'].to_list()) q['values'].append(df['values'].to_list())
q['sum'].append(float(df['values'].sum())) q['sum'].append(round(float(df['values'].sum()),2))
q['avg'].append(round(float(df['values'].mean()),2)) q['avg'].append(round(float(df['values'].mean()),2))
for last_value in df['values'].values[::-1]: for last_value in df['values'].values[::-1]:
if last_value > 0: if last_value > 0:
@ -165,7 +165,7 @@ async def event_model(
df_group = pd.concat([df_group, pd.DataFrame(concat_data, columns=df_group.columns)]) df_group = pd.concat([df_group, pd.DataFrame(concat_data, columns=df_group.columns)])
df_group.sort_values('date', inplace=True) df_group.sort_values('date', inplace=True)
q['values'].append(df_group['values'].to_list()) q['values'].append(df_group['values'].to_list())
q['sum'].append(float(df_group['values'].sum())) q['sum'].append(round(float(df_group['values'].sum()),2))
q['avg'].append(round(float(df_group['values'].mean()),2)) q['avg'].append(round(float(df_group['values'].mean()),2))
for last_value in df['values'].values[::-1]: for last_value in df['values'].values[::-1]:
if last_value > 0: if last_value > 0:
@ -188,7 +188,7 @@ async def event_model(
if last_value > 0: if last_value > 0:
q['last_value'] = float(last_value) q['last_value'] = float(last_value)
break break
q['sum'].append(float(df['values'].sum())) q['sum'].append(round(float(df['values'].sum()),2))
q['avg'].append(round(float(df['values'].mean()),2)) q['avg'].append(round(float(df['values'].mean()),2))
if item['time_particle'] in ('P1D', 'P1W'): if item['time_particle'] in ('P1D', 'P1W'):
q['date_range'] = [d.strftime('%Y-%m-%d') for d in q['date_range']] q['date_range'] = [d.strftime('%Y-%m-%d') for d in q['date_range']]