update

config.py

@@ -566,11 +566,11 @@ class BaseConfig(object):
                 # {"dataListCode": 7, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP_REGION_H},
             ]
         },
-        1: {"dataListDesc": "相对30天数据列表", "dataListCode": 4, "keyPrefix": RECALL_KEY_NAME_PREFIX_30DAY},
-        2: {"dataListDesc": "地域小时级", "dataListCode": 1, "keyPrefix": RECALL_KEY_NAME_PREFIX_REGION_BY_H},
-        3: {"dataListDesc": "地域相对24小时级", "dataListCode": 2, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP1_REGION_24H_H},
-        4: {"dataListDesc": "非地域相对24小时级", "dataListCode": 3, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H},
-        5: {"dataListDesc": "非地域相对24小时级列表2", "dataListCode": 4, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H},
+        1: {"dataListDesc": "相对30天数据列表", "dataListCode": 1, "keyPrefix": RECALL_KEY_NAME_PREFIX_30DAY},
+        2: {"dataListDesc": "地域小时级", "dataListCode": 2, "keyPrefix": RECALL_KEY_NAME_PREFIX_REGION_BY_H},
+        3: {"dataListDesc": "地域相对24小时级", "dataListCode": 3, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP1_REGION_24H_H},
+        4: {"dataListDesc": "非地域相对24小时级", "dataListCode": 4, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_24H_H},
+        5: {"dataListDesc": "非地域相对24小时级列表2", "dataListCode": 5, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_24H_H},
         # 5: {"dataListDesc": "非地域相对48小时级", "dataListCode": 5, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP2_REGION_48H_H},
         # 6: {"dataListDesc": "非地域相对48小时级列表2", "dataListCode": 6, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP3_REGION_48H_H},
         # 7: {"dataListDesc": "大列表", "dataListCode": 7, "keyPrefix": RECALL_KEY_NAME_PREFIX_DUP_REGION_H},

manager_op.py

@@ -38,6 +38,8 @@ def get_video_list(ab_exp_code, search_time, data_list_type, region_code, page_n
     if data_list_type == 0:
         # 视频数据表类型 选择为全部
         key_prefix_list = config_.VIDEO_DATA_LIST_MAPPING.get(data_list_type).get('keyPrefixList')
+        if ab_exp_code not in ['139']:
+            key_prefix_list = key_prefix_list[1:]
         for item in key_prefix_list:
             data_list_code = item.get('dataListCode')
             key_prefix = item.get('keyPrefix')
@@ -63,10 +65,14 @@ def get_video_list(ab_exp_code, search_time, data_list_type, region_code, page_n
     else:
         key_prefix = config_.VIDEO_DATA_LIST_MAPPING.get(data_list_type).get('keyPrefix')
         if data_list_type == 1:
-            key_name = f"{key_prefix}{data_key}:{rule_key}:{search_time_seg[0]}"
+            if ab_exp_code not in ['139']:
+                key_data = None
+            else:
+                key_name = f"{key_prefix}{data_key}:{rule_key}:{search_time_seg[0]}"
+                key_data = redis_helper.get_all_data_from_zset(key_name=key_name, desc=True, with_scores=True)
         else:
             key_name = f"{key_prefix}{region_code}:{data_key}:{rule_key}:{search_time}"
-        key_data = redis_helper.get_all_data_from_zset(key_name=key_name, desc=True, with_scores=True)
+            key_data = redis_helper.get_all_data_from_zset(key_name=key_name, desc=True, with_scores=True)
         if key_data is None:
             videos = []
         else:
@@ -127,6 +133,8 @@ def search_video(ab_exp_code, search_time, data_list_type, region_code, video_id
     if data_list_type == 0 and region_code == '0':
         # 视频数据表类型 和 地域 选择都为全部
         key_prefix_list = config_.VIDEO_DATA_LIST_MAPPING.get(data_list_type).get('keyPrefixList')
+        if ab_exp_code not in ['139']:
+            key_prefix_list = key_prefix_list[1:]
         code_list = [code for _, code in config_.REGION_CODE.items()]
         for item in key_prefix_list:
             data_list_code = item.get('dataListCode')
@@ -169,6 +177,8 @@ def search_video(ab_exp_code, search_time, data_list_type, region_code, video_id
     elif data_list_type == 0:
         # 视频数据表类型 选择为全部
         key_prefix_list = config_.VIDEO_DATA_LIST_MAPPING.get(data_list_type).get('keyPrefixList')
+        if ab_exp_code not in ['139']:
+            key_prefix_list = key_prefix_list[1:]
         for item in key_prefix_list:
             data_list_code = item.get('dataListCode')
             key_prefix = item.get('keyPrefix')
@@ -198,6 +208,8 @@ def search_video(ab_exp_code, search_time, data_list_type, region_code, video_id
         key_prefix = config_.VIDEO_DATA_LIST_MAPPING.get(data_list_type).get('keyPrefix')
         for code in code_list:
             if data_list_type == 1:
+                if ab_exp_code not in ['139']:
+                    continue
                 key_name = f"{key_prefix}{data_key}:{rule_key}:{search_time_seg[0]}"
             else:
                 key_name = f"{key_prefix}{code}:{data_key}:{rule_key}:{search_time}"
@@ -220,11 +232,16 @@ def search_video(ab_exp_code, search_time, data_list_type, region_code, video_id
     else:
         key_prefix = config_.VIDEO_DATA_LIST_MAPPING.get(data_list_type).get('keyPrefix')
         if data_list_type == 1:
-            key_name = f"{key_prefix}{data_key}:{rule_key}:{search_time_seg[0]}"
+            if ab_exp_code not in ['139']:
+                rank, score = None, None
+            else:
+                key_name = f"{key_prefix}{data_key}:{rule_key}:{search_time_seg[0]}"
+                rank = redis_helper.get_rank_with_value(key_name=key_name, value=int(video_id), desc=True)
+                score = redis_helper.get_score_with_value(key_name=key_name, value=int(video_id))
         else:
             key_name = f"{key_prefix}{region_code}:{data_key}:{rule_key}:{search_time}"
-        rank = redis_helper.get_rank_with_value(key_name=key_name, value=int(video_id), desc=True)
-        score = redis_helper.get_score_with_value(key_name=key_name, value=int(video_id))
+            rank = redis_helper.get_rank_with_value(key_name=key_name, value=int(video_id), desc=True)
+            score = redis_helper.get_score_with_value(key_name=key_name, value=int(video_id))
         if rank is not None and score is not None:
             videos = {
                 'abExpCode': ab_exp_code,