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

1

Browse Source
This commit is contained in:
wuaho 2021-08-30 15:57:47 +08:00
parent 25a47dc586
commit 268362d05b
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,8 +136,8 @@ 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(round(df['values'].sum(),2)) q['sum'].append(int(df['values'].sum()))
q['avg'].append(round(df['values'].mean(), 2)) q['avg'].append(int(df['values'].mean()))
for last_value in df['values'].values[::-1]: for last_value in df['values'].values[::-1]:
if last_value > 0: if last_value > 0:
q['last_value'] = int(last_value) q['last_value'] = int(last_value)
@ -188,7 +188,7 @@ async def event_model(
if last_value > 0: if last_value > 0:
q['last_value'] = last_value q['last_value'] = last_value
break break
q['sum'].append(round(df['values'].sum(),2)) q['sum'].append(int(df['values'].sum()))
q['avg'].append(round(df['values'].mean(), 2)) q['avg'].append(round(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']]