merge shield-videos-20220826

check_video_limit_distribute.py

@@ -216,7 +216,8 @@ def check_region_videos(rule_params):
         return
 
     # 对已超分发的视频进行移除
-    region_code_list = [code for region, code in config_.REGION_CODE.items()]
+    region_code_list = [code for region, code in config_.REGION_CODE.items()] + \
+                       [code for city, code in config_.CITY_CODE.items()]
 
     for param in rule_params.get('params_list'):
         data_key = param.get('data')

config.py

@@ -462,7 +462,7 @@ class BaseConfig(object):
     SHIELD_CONFIG = {
         REGION_CODE['北京']: [BENSHAN_ZHUFU_KEY_NAME, XNG_KEY_NAME, ],
         REGION_CODE['重庆']: [BENSHAN_ZHUFU_KEY_NAME, ],
-        REGION_CODE['None']: [BENSHAN_ZHUFU_KEY_NAME, SPECIAL_AREA_LIMIT_KEY_NAME, XNG_KEY_NAME],
+        REGION_CODE['None']: [BENSHAN_ZHUFU_KEY_NAME, SPECIAL_AREA_LIMIT_KEY_NAME, XNG_KEY_NAME, ],
         CITY_CODE['广州']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
         CITY_CODE['深圳']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],
         CITY_CODE['成都']: [SPECIAL_AREA_LIMIT_KEY_NAME, ],

shield_videos.py

@@ -36,7 +36,7 @@ def get_benshanzhufu_videos():
 def get_xng_videos():
     """获取小年糕视频并存入redis"""
     try:
-        # 获取本山祝福视频
+        # 获取小年糕视频
         sql = f"SELECT videoid FROM {config_.PROJECT_XNG}.{config_.TABLE_XNG};"
         records = execute_sql_from_odps(project=config_.PROJECT_XNG, sql=sql)
         video_id_list = []
@@ -44,6 +44,8 @@ def get_xng_videos():
             for record in reader:
                 video_id = int(record['videoid'])
                 video_id_list.append(video_id)
+
+
         log_.info(f"xng videos count = {len(video_id_list)}")
         # 存入redis
         if len(video_id_list) > 0:
@@ -58,9 +60,10 @@ def get_xng_videos():
 def get_special_area_limit_videos():
     """获取特殊地域屏蔽视频并存入redis"""
     try:
-        # 获取本山祝福视频
+        # 获取特殊地域屏蔽视频
         sql = f"SELECT videoid FROM {config_.PROJECT_SPECIAL_AREA_LIMIT}.{config_.TABLE_SPECIAL_AREA_LIMIT};"
         records = execute_sql_from_odps(project=config_.PROJECT_SPECIAL_AREA_LIMIT, sql=sql)
+
         video_id_list = []
         with records.open_reader() as reader:
             for record in reader:

videos_filter.py

@@ -639,7 +639,8 @@ def filter_process_with_param(param, region_code_list, now_date, now_h):
 
 def filter_region_videos(rule_params):
     """过滤地域分组规则视频"""
-    region_code_list = [code for region, code in region_code.items()]
+    region_code_list = [code for region, code in region_code.items()] + \
+                       [code for city, code in config_.CITY_CODE.items()]
     log_.info("region_h videos filter start ...")
     # 获取当前日期
     now_date = date.today().strftime('%Y%m%d')