update

config.py

@@ -236,9 +236,11 @@ class BaseConfig(object):
             },
             'data_params': {
                 'data1': [APP_TYPE['VLOG'], ],
+                'data2': [APP_TYPE['VLOG'], APP_TYPE['LOVE_LIVE'], APP_TYPE['LONG_VIDEO'], APP_TYPE['SHORT_VIDEO']],
             },
             'params_list': [
                 {'data': 'data1', 'rule': 'rule2'},
+                {'data': 'data2', 'rule': 'rule2'},
             ],
         },
         APP_TYPE['ZUI_JING_QI']: {
@@ -352,9 +354,11 @@ class BaseConfig(object):
             },
             'data_params': {
                 'data1': [APP_TYPE['VLOG'], ],
+                'data2': [APP_TYPE['VLOG'], APP_TYPE['LOVE_LIVE'], APP_TYPE['LONG_VIDEO'], APP_TYPE['SHORT_VIDEO']],
             },
             'params_list': [
                 {'data': 'data1', 'rule': 'rule2'},
+                {'data': 'data2', 'rule': 'rule2'},
             ],
         },
         APP_TYPE['ZUI_JING_QI']: {
@@ -478,9 +482,11 @@ class BaseConfig(object):
             },
             'data_params': {
                 'data1': [APP_TYPE['VLOG'], ],
+                'data2': [APP_TYPE['VLOG'], APP_TYPE['LOVE_LIVE'], APP_TYPE['LONG_VIDEO'], APP_TYPE['SHORT_VIDEO']],
             },
             'params_list': [
                 {'data': 'data1', 'rule': 'rule3'},
+                {'data': 'data2', 'rule': 'rule3'},
             ],
         },
         APP_TYPE['ZUI_JING_QI']: {

redis_data_monitor.py

@@ -37,32 +37,36 @@ def region_data_monitor(now_date, now_h):
         '地域分组小时级数据': config_.RECALL_KEY_NAME_PREFIX_REGION_BY_H,
         '地域分组相对24h去重后数据': config_.RECALL_KEY_NAME_PREFIX_DUP1_REGION_24H_H,
         '不区分地域相对24h去重后数据': config_.RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H,
+        '不区分地域相对24h筛选后剩余去重后数据': config_.RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H,
         'rov模型预测列表去重后数据': config_.RECALL_KEY_NAME_PREFIX_DUP_REGION_H,
     }
     region_code_list = [code for region, code in region_code.items()]
     for app_type, params in rule_params.items():
-        for data_key, data_param in params['data_params'].items():
-            for rule_key, rule_param in params['rule_params'].items():
-                for key_con, key_prefix in key_prefix_dict.items():
-                    no_update_region_list = []
-                    for region in region_code_list:
-                        region_key_name = f"{key_prefix}{region}.{app_type}.{data_key}.{rule_key}.{now_date}.{now_h}"
-                        if not redis_helper.key_exists(key_name=region_key_name):
-                            no_update_region_list.append(region)
-                    if len(no_update_region_list) == len(region_code_list):
-                        msg_text = f"\n- 所属项目: rov-server/rov-offline" \
-                                   f"\n- 告警名称: 离线更新数据未按时更新告警" \
-                                   f"\n- 所属环境: {config_.ENV_TEXT}" \
-                                   f"\n- appType: {app_type}" \
-                                   f"\n- now_date: {now_date}" \
-                                   f"\n- now_h: {now_h}" \
-                                   f"\n- 告警描述: {key_con}未按时更新, data_key={data_key}, rule_key={rule_key}"
-                        log_.info(f"msg_text = {msg_text}")
-                        send_msg_to_feishu(
-                            webhook=config_.FEISHU_ROBOT['server_robot'].get('webhook'),
-                            key_word=config_.FEISHU_ROBOT['server_robot'].get('key_word'),
-                            msg_text=msg_text
-                        )
+        for param in params.get('params_list'):
+            data_key = param.get('data')
+            rule_key = param.get('rule')
+            for key_con, key_prefix in key_prefix_dict.items():
+                if key_con == '不区分地域相对24h筛选后剩余去重后数据' and rule_key != 'rule4':
+                    continue
+                no_update_region_list = []
+                for region in region_code_list:
+                    region_key_name = f"{key_prefix}{region}.{app_type}.{data_key}.{rule_key}.{now_date}.{now_h}"
+                    if not redis_helper.key_exists(key_name=region_key_name):
+                        no_update_region_list.append(region)
+                if len(no_update_region_list) == len(region_code_list):
+                    msg_text = f"\n- 所属项目: rov-server/rov-offline" \
+                               f"\n- 告警名称: 离线更新数据未按时更新告警" \
+                               f"\n- 所属环境: {config_.ENV_TEXT}" \
+                               f"\n- appType: {app_type}" \
+                               f"\n- now_date: {now_date}" \
+                               f"\n- now_h: {now_h}" \
+                               f"\n- 告警描述: {key_con}未按时更新, data_key={data_key}, rule_key={rule_key}"
+                    log_.info(f"msg_text = {msg_text}")
+                    send_msg_to_feishu(
+                        webhook=config_.FEISHU_ROBOT['server_robot'].get('webhook'),
+                        key_word=config_.FEISHU_ROBOT['server_robot'].get('key_word'),
+                        msg_text=msg_text
+                    )
 
 
 def special_videos_monitor(now_date, now_h):
@@ -136,7 +140,7 @@ def monitor(now_date, now_h):
     rov_data_monitor(now_date=now_date, now_h=now_h)
     region_data_monitor(now_date=now_date, now_h=now_h)
     special_videos_monitor(now_date=now_date, now_h=now_h)
-    whole_movies_monitor(now_date=now_date, now_h=now_h)
+    # whole_movies_monitor(now_date=now_date, now_h=now_h)
 
 
 if __name__ == '__main__':

videos_filter.py

@@ -880,11 +880,11 @@ def main():
         # appType = 6，ROV召回池视频过滤
         # filter_rov_pool(app_type=config_.APP_TYPE['SHORT_VIDEO'])
         # appType = 13，票圈视频APP视频过滤
-        filter_rov_pool(app_type=config_.APP_TYPE['APP'])
+        # filter_rov_pool(app_type=config_.APP_TYPE['APP'])
         # appType = 18, ROV召回池视频过滤
-        filter_rov_pool(app_type=config_.APP_TYPE['LAO_HAO_KAN_VIDEO'])
+        # filter_rov_pool(app_type=config_.APP_TYPE['LAO_HAO_KAN_VIDEO'])
         # appType = 19, ROV召回池视频过滤
-        filter_rov_pool(app_type=config_.APP_TYPE['ZUI_JING_QI'])
+        # filter_rov_pool(app_type=config_.APP_TYPE['ZUI_JING_QI'])
         # 流量池视频过滤
         filter_flow_pool()
         # 兜底视频过滤
@@ -913,7 +913,7 @@ def main():
         # 过滤地域分组24h规则视频
         # filter_region_videos_24h()
         # 过滤完整电影数据
-        filter_whole_movies()
+        # filter_whole_movies()
     except Exception as e:
         log_.error(traceback.format_exc())
         send_msg_to_feishu(