diff --git a/apps/mosquito/tasks.py b/apps/mosquito/tasks.py index 72e6d05..f20c9ba 100644 --- a/apps/mosquito/tasks.py +++ b/apps/mosquito/tasks.py @@ -53,7 +53,7 @@ def get_daily_statistic(enable_container=False): if enable_container: for device_id in device_list: device_container[device_id] = device_container[device_id] | \ - {(entry.count, entry.data_time) + {(entry.data_time, entry.count) for entry in daily_queryset if entry.device_id == device_id} calc_result = sum(map(lambda x: int(x.count), daily_queryset)) date = q.date @@ -65,12 +65,16 @@ def update_daily_statistic(): full_ret = None # 计算每天聚合值 daily_ret, device_container = get_daily_statistic(enable_container=True) - for k in device_container: print(k, device_container[k]) # 计算没有记录的日期,值 if daily_ret: full_ret = fill_date(daily_ret, tz=pytz.timezone("UTC")) + if device_container: + for device_id in device_container: + container = dict(device_container[device_id]) + full_daily_ret = fill_date(container, tz=pytz.timezone("UTC")) + # 写入数据库 if full_ret: _date_list = [k for k in full_ret]