过滤需求

utils.py

@@ -901,9 +901,10 @@ class FilterVideos(object):
         filtered_viewed_result = self.filter_video_viewed_status(video_ids=filtered_pre_result)
         if not filtered_viewed_result:
             return None
-
-        filtered_viewed_videos = [int(video_id) for video_id in filtered_viewed_result]
-        return filtered_viewed_videos
+        result = self.filter_videos_with_tags_rule([int(video_id) for video_id in filtered_viewed_result],
+                                                   video_tag_dict, tags_rule)
+        result = [int(video_id) for video_id in result]
+        return result
 
     def filter_videos_with_tags_rule(self, video_ids: list, video_tag_dict: list, tags_rule: dict):
         # 1 获取当日节日信息和小时数字
@@ -918,14 +919,15 @@ class FilterVideos(object):
             rules = tags_rule["早上好"] if "早上好" in tags_rule.keys() else {}
             start = rules["start"] if "start" in rules.keys() else 0
             end = rules["end"] if "end" in rules.keys() else 23
-            if hour < start and hour > end:
+            if hour < start or hour > end:
                 filter_tags.append(tag_day)
         if len(holiday_cn) != 0:
             rules = tags_rule[holiday_cn] if holiday_cn in tags_rule.keys() else {}
             start = rules["start"] if "start" in rules.keys() else 0
             end = rules["end"] if "end" in rules.keys() else 9
-            if hour < start and hour > end:
+            if hour < start or hour > end:
                 filter_tags.append(holiday_cn)
+        print("zb:" + str(filter_tags))
         if len(filter_tags) == 0:
             return video_ids
         # 3 获取视频的tag 进行过滤