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

按时段

Browse Source
This commit is contained in:
wuaho 2021-10-09 18:41:34 +08:00
parent ed98584815
commit 6bd203997a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/api_v1/endpoints/dashboard.py
View File

@ -162,7 +162,7 @@ async def edit_report(data_in: schemas.EditReport,
"""编辑报表""" """编辑报表"""
res = await crud.dashboard.update_one(db, {'_id': data_in.id, 'reports.report_id': data_in.report.report_id}, res = await crud.dashboard.update_one(db, {'_id': data_in.id, 'reports.report_id': data_in.report.report_id},
{'$set': {'reports.$': data_in.report.dict(skip_defaults=True)}}) {'$set': {f'reports.$.{k}':v for k,v in data_in.report.dict(skip_defaults=True).items()}})
return schemas.Msg(code=0, msg='ok', data='ok') return schemas.Msg(code=0, msg='ok', data='ok')

1
core/config.py
View File

@ -288,6 +288,7 @@ class Settings(BaseSettings):
'total': lambda col, zone: func.toStartOfDay(func.addHours(col, zone)).label('date'), 'total': lambda col, zone: func.toStartOfDay(func.addHours(col, zone)).label('date'),
'P1W': lambda col, zone: func.toStartOfWeek(func.addHours(col, zone)).label('date'), 'P1W': lambda col, zone: func.toStartOfWeek(func.addHours(col, zone)).label('date'),
'P1M': lambda col, zone: func.toStartOfMonth(func.addHours(col, zone)).label('date'), 'P1M': lambda col, zone: func.toStartOfMonth(func.addHours(col, zone)).label('date'),
'HOUR': lambda col, zone: func.toHour(func.addHours(col, zone)).label('date'),
} }

4
models/behavior_analysis.py
View File

@ -185,6 +185,10 @@ class BehaviorAnalysis:
def _get_date_range(self) -> Tuple[str, str, list]: def _get_date_range(self) -> Tuple[str, str, list]:
start_date: str = self.event_view.get('startTime') start_date: str = self.event_view.get('startTime')
end_date: str = self.event_view.get('endTime') end_date: str = self.event_view.get('endTime')
if self.time_particle == 'HOUR':
date_range = [i for i in range(24)]
return start_date, end_date, date_range
date_range = pd.date_range(start_date, end_date, freq=settings.PROPHET_TIME_GRAIN_MAP[self.time_particle], date_range = pd.date_range(start_date, end_date, freq=settings.PROPHET_TIME_GRAIN_MAP[self.time_particle],
tz='UTC').tolist() tz='UTC').tolist()
if self.time_particle in ('P1D', 'P1W', 'P1M'): if self.time_particle in ('P1D', 'P1W', 'P1M'):