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

1

Browse Source
This commit is contained in:
wuaho 2021-09-07 17:25:49 +08:00
parent 28ccf54d65
commit 405e2717b0
4 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,10 @@ async def event_model(
'avg': [], 'avg': [],
'event_name': item['event_name'], 'event_name': item['event_name'],
'format': item['format'], 'format': item['format'],
'last_value': 0 'last_value': 0,
'start_date': item['start_date'],
'end_date': item['end_date'],
'time_particle': item['time_particle']
} }
sql = item['sql'] sql = item['sql']
groupby = item['groupby'] groupby = item['groupby']
@ -278,6 +281,9 @@ async def retention_model(request: Request,
'title': title, 'title': title,
'filter_item_type': filter_item_type, 'filter_item_type': filter_item_type,
'filter_item': filter_item, 'filter_item': filter_item,
'start_date': res['start_date'],
'end_date': res['end_date'],
'time_particle': res['time_particle']
} }
return schemas.Msg(code=0, msg='ok', data=resp) return schemas.Msg(code=0, msg='ok', data=resp)
@ -371,7 +377,10 @@ async def retention_model_del(
'values': values, 'values': values,
'days': days, 'days': days,
'date_range': [d.strftime('%Y-%m-%d') for d in date_range][:unit_num + 1], 'date_range': [d.strftime('%Y-%m-%d') for d in date_range][:unit_num + 1],
'title': title 'title': title,
'start_date': res['start_date'],
'end_date': res['end_date'],
'time_particle': res['time_particle']
} }
return schemas.Msg(code=0, msg='ok', data=data) return schemas.Msg(code=0, msg='ok', data=data)
@ -512,7 +521,13 @@ async def funnel_model(
_ = date_data.setdefault(key[0].strftime('%Y-%m-%d'), {}) _ = date_data.setdefault(key[0].strftime('%Y-%m-%d'), {})
_[key[1]] = tmp _[key[1]] = tmp
title = (groupby or ['总体']) + cond_level title = (groupby or ['总体']) + cond_level
resp = {'list': data_list, 'date_data': date_data, 'title': title, 'level': cond_level resp = {'list': data_list,
'date_data': date_data,
'title': title,
'level': cond_level,
'start_date': res['start_date'],
'end_date': res['end_date'],
'time_particle': res['time_particle']
} }
return schemas.Msg(code=0, msg='ok', data=resp) return schemas.Msg(code=0, msg='ok', data=resp)
@ -552,7 +567,11 @@ async def scatter_model(
max_v = int(df['values'].max()) max_v = int(df['values'].max())
min_v = int(df['values'].min()) min_v = int(df['values'].min())
interval = (max_v - min_v) // 10 or 1 interval = (max_v - min_v) // 10 or 1
resp = {'list': dict()} resp = {'list': dict(),
'start_date': res['start_date'],
'end_date': res['end_date'],
'time_particle': res['time_particle']
}
if not quota_interval_arr: if not quota_interval_arr:
resp['label'] = [f'[{i},{i + interval})' for i in range(min_v, max_v, interval)] resp['label'] = [f'[{i},{i + interval})' for i in range(min_v, max_v, interval)]
@ -653,7 +672,10 @@ async def trace_model_sql(
# ) # )
data = { data = {
'nodes': [{'name': item} for item in nodes], 'nodes': [{'name': item} for item in nodes],
'links': links 'links': links,
'start_date': res['start_date'],
'end_date': res['end_date'],
'time_particle': res['time_particle']
} }
return schemas.Msg(code=0, msg='ok', data=data) return schemas.Msg(code=0, msg='ok', data=data)

4
api/api_v1/endpoints/xquery.py
View File

@ -60,7 +60,9 @@ async def ltv_model_sql(
df.rename(columns={'cnt1': '设备数'}, inplace=True) df.rename(columns={'cnt1': '设备数'}, inplace=True)
data = { data = {
'title': df.columns.tolist(), 'title': df.columns.tolist(),
'rows': df.values.tolist() 'rows': df.values.tolist(),
'start_date': res['start_date'],
'end_date': res['end_date']
} }
return schemas.Msg(code=0, msg='ok', data=data) return schemas.Msg(code=0, msg='ok', data=data)

30
models/behavior_analysis.py
View File

@ -281,7 +281,10 @@ class BehaviorAnalysis:
'groupby': ['date'] + [i.key for i in self.groupby], 'groupby': ['date'] + [i.key for i in self.groupby],
'date_range': self.date_range, 'date_range': self.date_range,
'event_name': [event_name_a, event_name_b], 'event_name': [event_name_a, event_name_b],
'unit_num': self.unit_num 'unit_num': self.unit_num,
'time_particle': self.time_particle,
'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
} }
def event_model_sql(self): def event_model_sql(self):
@ -363,8 +366,10 @@ class BehaviorAnalysis:
'date_range': self.date_range, 'date_range': self.date_range,
'event_name': event_name_display or event_name, 'event_name': event_name_display or event_name,
'format': format, 'format': format,
'report_name': self.report_name or 'temp',
'time_particle': self.time_particle, 'time_particle': self.time_particle,
'report_name': self.report_name or 'temp' 'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
}) })
return sqls return sqls
@ -424,7 +429,10 @@ ORDER BY level
return {'sql': sql, return {'sql': sql,
'groupby': [i.key for i in self.groupby], 'groupby': [i.key for i in self.groupby],
'date_range': self.date_range, 'date_range': self.date_range,
'cond_level': cond_level 'cond_level': cond_level,
'time_particle': self.time_particle,
'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
} }
def scatter_model_sql(self): def scatter_model_sql(self):
@ -464,7 +472,10 @@ ORDER BY level
'interval_type': event['intervalType'], 'interval_type': event['intervalType'],
'analysis': analysis, 'analysis': analysis,
'quota_interval_arr': quota_interval_arr, 'quota_interval_arr': quota_interval_arr,
'groupby': [i.key for i in self.groupby] 'groupby': [i.key for i in self.groupby],
'time_particle': self.time_particle,
'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
} }
elif event.get('quota'): elif event.get('quota'):
event_attr_col = getattr(self.event_tbl.c, event['quota']) event_attr_col = getattr(self.event_tbl.c, event['quota'])
@ -479,7 +490,10 @@ ORDER BY level
'interval_type': event['intervalType'], 'interval_type': event['intervalType'],
'analysis': analysis, 'analysis': analysis,
'quota_interval_arr': quota_interval_arr, 'quota_interval_arr': quota_interval_arr,
'groupby': [i.key for i in self.groupby] 'groupby': [i.key for i in self.groupby],
'time_particle': self.time_particle,
'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
} }
def trace_model_sql(self): def trace_model_sql(self):
@ -589,6 +603,9 @@ ORDER BY values desc"""
print(sql) print(sql)
return { return {
'sql': sql, 'sql': sql,
'time_particle': self.time_particle,
'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
} }
def retention_model_sql2(self): def retention_model_sql2(self):
@ -655,4 +672,7 @@ group by a.reg_date) log on reg.date=log.reg_date
'unit_num': self.unit_num, 'unit_num': self.unit_num,
'filter_item_type': filter_item_type, 'filter_item_type': filter_item_type,
'filter_item': filter_item, 'filter_item': filter_item,
'time_particle': self.time_particle,
'start_date': self.start_date[:10],
'end_date': self.end_date[:10],
} }

5
models/x_analysis.py
View File

@ -145,4 +145,7 @@ class XAnalysis:
order by date order by date
""" """
print(sql) print(sql)
return {'sql': sql,'quota':quota} return {'sql': sql,'quota':quota,
'start_date': self.event_view['startTime'][:10],
'end_date': self.event_view['endTime'][:10],
}