|
@@ -56,13 +56,13 @@ class SplitVodHlsObject:
|
|
|
tab_val = str(item['tab_val'] + 10)
|
|
|
vod_hls_union = vod_hls_union.union(
|
|
|
Vod_Hls_List[item['tab_val'] - 1].objects.filter(id=item['vod_id']).annotate(
|
|
|
- tab_val=Value(tab_val, output_field=CharField())))
|
|
|
+ tab_val=Value(tab_val, output_field=CharField())), all=True)
|
|
|
else:
|
|
|
kwargs.pop('type_list')
|
|
|
for index, vod_hls_model in enumerate(Vod_Hls_List):
|
|
|
tab_val = str(index + 11)
|
|
|
vod_hls_union = vod_hls_union.union(vod_hls_model.objects.filter(**kwargs).annotate(
|
|
|
- tab_val=Value(tab_val, output_field=CharField())))
|
|
|
+ tab_val=Value(tab_val, output_field=CharField())), all=True)
|
|
|
LOGGER.info('vod_hls_union结果:{},kwargs:{}'.format(vod_hls_union.values(), kwargs))
|
|
|
except Exception as e:
|
|
|
LOGGER.info('get_vod_hls_data异常详情,kwargs:{},errLine:{},errMsg:{}'.format(kwargs, e.__traceback__.tb_lineno, repr(e)))
|