|
|
@@ -331,7 +331,7 @@ class DeviceDataView(View):
|
|
|
device_info_list = [item[key] for item in device_info for key in item]
|
|
|
count_all = len(device_info_list)
|
|
|
res = {}
|
|
|
- vod_list = []
|
|
|
+ video_list = []
|
|
|
region_list = []
|
|
|
for item in time_list:
|
|
|
video_playback_qs = video_playback_time_qs.filter(startTime__range=(item[0], item[1]))
|
|
|
@@ -344,8 +344,7 @@ class DeviceDataView(View):
|
|
|
'startTime': item[0],
|
|
|
'endTime': item[1]
|
|
|
}
|
|
|
- vod_list.append(vod_dict)
|
|
|
- res['vodHls'] = vod_list
|
|
|
+ video_list.append(vod_dict)
|
|
|
type_country_qs = UidSetModel.objects.filter(uid__in=uid_list).values(
|
|
|
'tb_country').annotate(count=Count('tb_country')).order_by('-count')
|
|
|
for type_country in type_country_qs:
|
|
|
@@ -359,8 +358,8 @@ class DeviceDataView(View):
|
|
|
'rate': rate
|
|
|
}
|
|
|
region_list.append(country_dict)
|
|
|
- res['region'] = region_list
|
|
|
-
|
|
|
+ res['vodHls'] = video_list
|
|
|
+ res['region'] = region_list
|
|
|
return response.json(0, res)
|
|
|
except Exception as e:
|
|
|
print(e)
|
|
|
@@ -411,7 +410,6 @@ class DeviceDataView(View):
|
|
|
'rate': rate
|
|
|
}
|
|
|
info_list.append(info_dict)
|
|
|
- res['addDevice'] = info_list
|
|
|
# 统计地区设备数量
|
|
|
device_info_country_qs = deivce_uid_qs.values('tb_country').annotate(
|
|
|
count=Count('tb_country')).order_by(
|
|
|
@@ -430,7 +428,6 @@ class DeviceDataView(View):
|
|
|
'rate': rate
|
|
|
}
|
|
|
region_list.append(country_dict)
|
|
|
- res['region'] = CommonService.list_sort(region_list)
|
|
|
# 统计设备类型数量
|
|
|
device_info_type_qs = Device_Info.objects.filter(UID__in=uid_list)
|
|
|
device_type_qs = device_info_type_qs.values('Type').annotate(
|
|
|
@@ -457,7 +454,6 @@ class DeviceDataView(View):
|
|
|
'count': type_count,
|
|
|
'rate': rate
|
|
|
})
|
|
|
- res['type'] = CommonService.list_sort(type_list)
|
|
|
# 云存版本数量
|
|
|
cloud_qs = deivce_uid_qs.exclude(cloud_vod=2).values('uid')
|
|
|
cloud_list = [item[key] for item in cloud_qs for key in item]
|
|
|
@@ -477,16 +473,20 @@ class DeviceDataView(View):
|
|
|
'count': type_count,
|
|
|
'rate': rate
|
|
|
})
|
|
|
- res['version'] = CommonService.list_sort(version_list)
|
|
|
else:
|
|
|
- info_dict = {
|
|
|
+ null_dict = {
|
|
|
'startTime': item[0],
|
|
|
'endTime': item[1],
|
|
|
'count': 0,
|
|
|
'rate': 0.0
|
|
|
}
|
|
|
- info_list.append(info_dict)
|
|
|
+ info_list.append(null_dict)
|
|
|
res['addDevice'] = info_list
|
|
|
+ res['addDevice'] = info_list
|
|
|
+ res['region'] = CommonService.list_sort(region_list)
|
|
|
+ res['type'] = CommonService.list_sort(type_list)
|
|
|
+ res['version'] = CommonService.list_sort(version_list)
|
|
|
+
|
|
|
return response.json(0, res)
|
|
|
except Exception as e:
|
|
|
print(e)
|
