update

check_video_limit_distribute.py

@@ -109,11 +109,39 @@ def process_with_region(app_type, data_key, rule_key, region, stop_distribute_vi
         expire_time=2 * 3600
     )
     # 将已超分发视频加入到不区分相对24h线上过滤应用列表中
-    redis_helper.add_data_with_set(
-        key_name=f"{config_.H_VIDEO_FILER_24H}{region}.{app_type}.{data_key}.{rule_key}",
-        values=stop_distribute_video_id_list,
-        expire_time=2 * 3600
-    )
+    # redis_helper.add_data_with_set(
+    #     key_name=f"{config_.H_VIDEO_FILER_24H}{region}.{app_type}.{data_key}.{rule_key}",
+    #     values=stop_distribute_video_id_list,
+    #     expire_time=2 * 3600
+    # )
+
+    if rule_key == 'rule4':
+        key_prefix_list = [
+            config_.RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H,  # 不区分地域相对24h列表
+            config_.RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H,  # 不区分地域相对24h列表2
+            config_.RECALL_KEY_NAME_PREFIX_DUP_REGION_H,  # 大列表
+        ]
+    else:
+        key_prefix_list = [
+            config_.RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H,  # 不区分地域相对24h列表
+            config_.RECALL_KEY_NAME_PREFIX_DUP_REGION_H,  # 大列表
+        ]
+
+    for key_prefix in key_prefix_list:
+        key_name = f"{key_prefix}{region}.{app_type}.{data_key}.{rule_key}." \
+                   f"{datetime.datetime.strftime(now_date, '%Y%m%d')}.{now_h}"
+        if not redis_helper.key_exists(key_name=key_name):
+            if now_h == 0:
+                redis_date = now_date - datetime.timedelta(days=1)
+                redis_h = 23
+            else:
+                redis_date = now_date
+                redis_h = now_h - 1
+            key_name = f"{key_prefix}{region}.{app_type}.{data_key}.{rule_key}." \
+                       f"{datetime.datetime.strftime(redis_date, '%Y%m%d')}.{redis_h}"
+        redis_helper.remove_value_from_zset(key_name=key_name, value=stop_distribute_video_id_list)
+
+    """
     # 将已超分发视频 移除 不区分相对24h列表2
     if rule_key == 'rule4':
         key_name = f"{config_.RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H}" \
@@ -146,6 +174,7 @@ def process_with_region(app_type, data_key, rule_key, region, stop_distribute_vi
                    f"{region}.{app_type}.{data_key}.{rule_key}." \
                    f"{datetime.datetime.strftime(redis_date, '%Y%m%d')}.{redis_h}"
     redis_helper.remove_value_from_zset(key_name=key_name, value=stop_distribute_video_id_list)
+    """
 
     log_.info(f"app_type = {app_type}, data_key = {data_key}, rule_key = {rule_key}, region = {region} "
               f"videos check end!")

videos_filter.py

@@ -613,11 +613,11 @@ def filter_process_with_region(app_type, data_key, rule_key, region, now_date, n
             redis_helper.add_data_with_set(key_name=f"{config_.REGION_H_VIDEO_FILER_24H}"
                                                     f"{region}.{app_type}.{data_key}.{rule_key}",
                                            values=filter_videos, expire_time=2 * 3600)
-        elif i == 2:
-            # 将相对24h的数据需要过滤的视频加入到线上过滤应用列表中
-            redis_helper.add_data_with_set(key_name=f"{config_.H_VIDEO_FILER_24H}"
-                                                    f"{region}.{app_type}.{data_key}.{rule_key}",
-                                           values=filter_videos, expire_time=2 * 3600)
+        # elif i == 2:
+        #     # 将相对24h的数据需要过滤的视频加入到线上过滤应用列表中
+        #     redis_helper.add_data_with_set(key_name=f"{config_.H_VIDEO_FILER_24H}"
+        #                                             f"{region}.{app_type}.{data_key}.{rule_key}",
+        #                                    values=filter_videos, expire_time=2 * 3600)
 
     log_.info(f"app_type = {app_type}, data_key = {data_key}, rule_key = {rule_key}, region = {region} "
               f"videos filter end!")