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

1

Browse Source
This commit is contained in:
wuaho 2021-08-24 10:23:08 +08:00
parent 5325b31466
commit 13c1eeac94
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ async def event_model(
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(int(df['values'].sum())) q['sum'].append(int(df['values'].sum()))
q['date_range']=[f'{i[0]}-{i[1]}' for i in df.set_index(['svrindex','name']).index] q['date_range'] = [f'{i[0]}-{i[1]}' for i in df.set_index(['svrindex', 'name']).index]
res.append(q) res.append(q)
continue continue
@ -157,6 +157,7 @@ async def retention_model(
df = await ckdb.query_dataframe(sql) df = await ckdb.query_dataframe(sql)
concat_data = [] concat_data = []
df = pd.concat([df, pd.DataFrame(concat_data, columns=df.columns)]) df = pd.concat([df, pd.DataFrame(concat_data, columns=df.columns)])
df['date'] = df['date'].apply(lambda x: x.date())
# 计算整体 # 计算整体
summary_df = df.groupby('date')[['val_a', 'val_b', 'amount_a']].sum() summary_df = df.groupby('date')[['val_a', 'val_b', 'amount_a']].sum()
summary_values = {} summary_values = {}