|
|
@@ -57,27 +57,28 @@ class BusinessDataView(View):
|
|
|
vod_hls_summary_qs = VodHlsSummary.objects.filter(time__gte=start_time, time__lt=end_time).values()
|
|
|
vod_hls_qs = VodHlsModel.objects.filter(endTime__gte=start_time, endTime__lt=end_time).values(
|
|
|
'uid').annotate(uploadFrequency=Count('uid'), uploadDuration=Sum('sec')).order_by('uploadFrequency')
|
|
|
- vod_hls_list = list(vod_hls_qs)
|
|
|
- for each in vod_hls_summary_qs:
|
|
|
+ vod_hls_summary_list = list(vod_hls_summary_qs)
|
|
|
+
|
|
|
+ for item in vod_hls_qs:
|
|
|
flag = 0
|
|
|
- for item in vod_hls_list:
|
|
|
+ for each in vod_hls_summary_list:
|
|
|
if each['uid'] == item['uid']:
|
|
|
- item['uploadDuration'] += each['upload_duration']
|
|
|
- item['uploadFrequency'] += each['upload_frequency']
|
|
|
+ each['upload_duration'] += item['uploadDuration']
|
|
|
+ each['upload_frequency'] += item['uploadFrequency']
|
|
|
flag = 1
|
|
|
if flag == 0:
|
|
|
- vod_hls_list.append({
|
|
|
- 'uid': each['uid'],
|
|
|
- 'uploadDuration': each['upload_duration'],
|
|
|
- 'uploadFrequency': each['upload_frequency'],
|
|
|
+ vod_hls_summary_list.append({
|
|
|
+ 'uid': item['uid'],
|
|
|
+ 'uploadDuration': item['upload_duration'],
|
|
|
+ 'uploadFrequency': item['upload_frequency'],
|
|
|
'playFrequency': 0,
|
|
|
'playDuration': 0
|
|
|
})
|
|
|
- upload_device_count = len(vod_hls_list) # 上传设备数量
|
|
|
+ upload_device_count = len(vod_hls_summary_list) # 上传设备数量
|
|
|
|
|
|
res = {
|
|
|
'uploadDeviceCount': upload_device_count,
|
|
|
- 'vodData': vod_hls_list
|
|
|
+ 'vodData': vod_hls_summary_list
|
|
|
}
|
|
|
return response.json(0, res)
|
|
|
except Exception as e:
|
