|
@@ -55,27 +55,9 @@ class BusinessDataView(View):
|
|
|
return response.json(444, {'error param': 'startTime or endTime'})
|
|
|
try:
|
|
|
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_summary_list = list(vod_hls_summary_qs)
|
|
|
|
|
|
- for item in vod_hls_qs:
|
|
|
- flag = 0
|
|
|
- for each in vod_hls_summary_list:
|
|
|
- if each['uid'] == item['uid']:
|
|
|
- each['upload_duration'] += item['uploadDuration']
|
|
|
- each['upload_frequency'] += item['uploadFrequency']
|
|
|
- flag = 1
|
|
|
- if flag == 0:
|
|
|
- vod_hls_summary_list.append({
|
|
|
- 'uid': item['uid'],
|
|
|
- 'upload_duration': item['uploadDuration'],
|
|
|
- 'upload_frequency': item['uploadFrequency'],
|
|
|
- 'play_frequency': 0,
|
|
|
- 'play_duration': 0
|
|
|
- })
|
|
|
vod_hls_result = []
|
|
|
- for item in vod_hls_summary_list:
|
|
|
+ for item in vod_hls_summary_qs:
|
|
|
vod_hls_result.append({
|
|
|
'uid': item['uid'],
|
|
|
'uploadDuration': item['upload_duration'],
|