优化查询云存筛选不准确问题

Controller/CloudStorage.py

@@ -45,6 +45,7 @@ from Service.VodHlsService import SplitVodHlsObject
 ssl._create_default_https_context = ssl._create_unverified_context
 LOGGER = logging.getLogger('info')
 
+
 # 设备信息添加
 class CloudStorageView(View):
 
@@ -401,7 +402,7 @@ class CloudStorageView(View):
                         "Effect": "Allow",
                         "Action": "s3:*",
                         "Resource": ["{aws_arn}:::{bucket_name}/{uid_channel}*".
-                                     format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
+                                         format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
                     }
                 ]
             }
@@ -539,7 +540,7 @@ class CloudStorageView(View):
         })
 
         ids = [val['id'] for val in vod_hls_qs]
-        tag_type_list = SplitVodHlsObject.query_tag_type_list(ids)
+        tag_type_list = SplitVodHlsObject.query_tag_type_list(start_time, ids)
         for vod in vod_hls_qs:
             bucket_name = regroup_bucket_qs[vod['bucket_id']]['bucket']
             thumbs_png = '{uid}/vod{channel}/{time}/Thumb.jpeg'.format(uid=uid, channel=channel, time=vod['start_time'])

Service/VodHlsService.py

@@ -101,24 +101,38 @@ class SplitVodHlsObject:
                 kwargs['type_list'] = type_list
                 if week == 1:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_mon
                     vod_hls_mon = VodHlsMon.objects.filter(**kwargs)
                 elif week == 2:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_tus
                     vod_hls_tus = VodHlsTues.objects.filter(**kwargs)
                 elif week == 3:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_wed
                     vod_hls_wed = VodHlsWed.objects.filter(**kwargs)
                 elif week == 4:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_thur
                     vod_hls_thur = VodHlsThur.objects.filter(**kwargs)
                 elif week == 5:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_fri
                     vod_hls_fri = VodHlsFri.objects.filter(**kwargs)
                 elif week == 6:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_sat
                     vod_hls_sat = VodHlsSat.objects.filter(**kwargs)
                 elif week == 7:
                     kwargs = self.vod_query_param(week, **kwargs)
+                    if not kwargs:
+                        return vod_hls_sun
                     vod_hls_sun = VodHlsSun.objects.filter(**kwargs)
             vod_hls = vod_hls.union(vod_hls_mon, vod_hls_tus, vod_hls_wed, vod_hls_thur, vod_hls_fri, vod_hls_sat,
                                     vod_hls_sun)
@@ -189,11 +203,14 @@ class SplitVodHlsObject:
 
     @classmethod
     def vod_query_param(cls, week, **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'), week)
         if vod_ids:
             kwargs['id__in'] = vod_ids
+        if types and not vod_ids:
+            return []
         kwargs.pop('type_list')
         return kwargs
 
@@ -229,13 +246,14 @@ class SplitVodHlsObject:
             return False
 
     @classmethod
-    def query_tag_type_list(cls, vod_ids):
+    def query_tag_type_list(cls, start_time, vod_ids):
         """
         根据云存ID获取AI类型
         @return:
         """
         try:
-            qs = VodHlsTag.objects.filter(vod_hls_id__in=vod_ids).values('id', 'vod_hls_id')
+            week = datetime.datetime.fromtimestamp(int(start_time)).isoweekday()
+            qs = VodHlsTag.objects.filter(vod_hls_id__in=vod_ids, tab_num=int(week)).values('id', 'vod_hls_id')
             if not qs:
                 return []
             return list(qs)