|
|
@@ -47,7 +47,7 @@ class SplitVodHlsObject:
|
|
|
分表获取云存信息数据
|
|
|
@return: vod_hls
|
|
|
"""
|
|
|
- if kwargs['type_list']:
|
|
|
+ if 'type_list' in kwargs and kwargs['type_list']:
|
|
|
vod_hls_union = VodHls01.objects.none().annotate(tab_val=Value('11', output_field=CharField()))
|
|
|
kwargs = self.vod_query_param(**kwargs)
|
|
|
if 'id__in' in kwargs:
|
|
|
@@ -57,7 +57,8 @@ class SplitVodHlsObject:
|
|
|
Vod_Hls_List[item['tab_val'] - 1].objects.filter(id=item['vod_id']).annotate(
|
|
|
tab_val=Value(tab_val, output_field=CharField())), all=True)
|
|
|
else:
|
|
|
- kwargs.pop('type_list')
|
|
|
+ if 'type_list' in kwargs:
|
|
|
+ kwargs.pop('type_list')
|
|
|
vod_hls_01 = VodHls01.objects.filter(**kwargs).annotate(tab_val=Value('11', output_field=CharField()))
|
|
|
vod_hls_02 = VodHls02.objects.filter(**kwargs).annotate(tab_val=Value('12', output_field=CharField()))
|
|
|
vod_hls_03 = VodHls03.objects.filter(**kwargs).annotate(tab_val=Value('13', output_field=CharField()))
|
|
|
@@ -158,7 +159,6 @@ class SplitVodHlsObject:
|
|
|
|
|
|
@classmethod
|
|
|
def vod_query_param(cls, **kwargs):
|
|
|
- types = kwargs.get('type_list')
|
|
|
vod_ids = cls.query_tag_by_types(kwargs.get('uid'),
|
|
|
kwargs.get('start_time__range'),
|
|
|
kwargs.get('type_list'))
|
