liqian 2 years ago
parent
commit
ef19f2643c
2 changed files with 47 additions and 42 deletions
  1. 1 1
      app.py
  2. 46 41
      user2new.py

+ 1 - 1
app.py

@@ -161,7 +161,7 @@ def user_to_new():
     try:
         request_data = json.loads(request.get_data())
         log_.info({'requestUri': '/applet/user/to_new', 'requestData': request_data})
-        app_type = request_data.get('appType')
+        app_type = request_data.get('appType', None)
         mid = request_data.get('mid')
         uid = request_data.get('uid')
         user2new(app_type=app_type, mid=mid, uid=uid)

+ 46 - 41
user2new.py

@@ -17,47 +17,52 @@ def user2new(app_type, mid, uid):
     :return: None
     """
     redis_helper = RedisHelper()
+    if app_type is None:
+        app_type_list = [value for _, value in config_.APP_TYPE.items()]
+    else:
+        app_type_list = [app_type]
 
-    # 清除对应的预曝光列表
-    preview_key = f"{config_.PREVIEW_KEY_PREFIX}{app_type}.{mid}"
-    redis_helper.del_keys(key_name=preview_key)
-
-    # 清除对应的小时级数据及数据记录
-    h_key_prefix_list = [
-        config_.H_WITH_MID_RECALL_KEY_NAME_PREFIX,
-        config_.H_WITH_MID_RECORD_KEY_NAME_PREFIX,
-        config_.H_WITH_MID_RECALL_KEY_NAME_PREFIX_REGION_24H,
-        config_.H_WITH_MID_RECORD_KEY_NAME_PREFIX_REGION_24H
-    ]
-    for h_key_prefix in h_key_prefix_list:
-        h_key_name = f"{h_key_prefix}{mid}"
-        redis_helper.del_keys(key_name=h_key_name)
+    for app_type_item in app_type_list:
+        # 清除对应的预曝光列表
+        preview_key = f"{config_.PREVIEW_KEY_PREFIX}{app_type_item}.{mid}"
+        redis_helper.del_keys(key_name=preview_key)
 
-    # 清除用户上一次列表中对应的位置记录数据
-    last_idx_key_prefix_list = [
-        config_.LAST_VIDEO_FROM_ROV_POOL_PREFIX,
-        config_.LAST_VIDEO_FROM_RULE_DAY_POOL_PREFIX,
-        config_.LAST_VIDEO_FROM_ROV_POOL_PRE_PREFIX,
-        config_.LAST_VIDEO_FROM_ROV_POOL_NOW_PREFIX,
-        f"{config_.LAST_VIDEO_FROM_REGION_DUP_PREFIX}{1}.",
-        f"{config_.LAST_VIDEO_FROM_REGION_DUP_PREFIX}{2}.",
-    ]
-    # 天级
-    now_date = date.today().strftime('%Y%m%d')
-    pre_date = (date.today() - timedelta(days=1)).strftime('%Y%m%d')
-    date_list = [now_date, pre_date]
-    for dt in date_list:
-        for last_idx_key_prefix in last_idx_key_prefix_list:
-            h_key_name = f"{last_idx_key_prefix}{app_type}.{mid}.{dt}"
-            redis_helper.del_keys(key_name=h_key_name)
-    # 小时级
-    h = datetime.now().hour
-    h_list = [h]
-    if h == 0:
-        h_list.append(23)
-    else:
-        h_list.append(h-1)
-    for redis_h in h_list:
-        for last_idx_key_prefix in last_idx_key_prefix_list:
-            h_key_name = f"{last_idx_key_prefix}{app_type}.{mid}.{redis_h}"
+        # 清除对应的小时级数据及数据记录
+        h_key_prefix_list = [
+            config_.H_WITH_MID_RECALL_KEY_NAME_PREFIX,
+            config_.H_WITH_MID_RECORD_KEY_NAME_PREFIX,
+            config_.H_WITH_MID_RECALL_KEY_NAME_PREFIX_REGION_24H,
+            config_.H_WITH_MID_RECORD_KEY_NAME_PREFIX_REGION_24H
+        ]
+        for h_key_prefix in h_key_prefix_list:
+            h_key_name = f"{h_key_prefix}{mid}"
             redis_helper.del_keys(key_name=h_key_name)
+
+        # 清除用户上一次列表中对应的位置记录数据
+        last_idx_key_prefix_list = [
+            config_.LAST_VIDEO_FROM_ROV_POOL_PREFIX,
+            config_.LAST_VIDEO_FROM_RULE_DAY_POOL_PREFIX,
+            config_.LAST_VIDEO_FROM_ROV_POOL_PRE_PREFIX,
+            config_.LAST_VIDEO_FROM_ROV_POOL_NOW_PREFIX,
+            f"{config_.LAST_VIDEO_FROM_REGION_DUP_PREFIX}{1}.",
+            f"{config_.LAST_VIDEO_FROM_REGION_DUP_PREFIX}{2}.",
+        ]
+        # 天级
+        now_date = date.today().strftime('%Y%m%d')
+        pre_date = (date.today() - timedelta(days=1)).strftime('%Y%m%d')
+        date_list = [now_date, pre_date]
+        for dt in date_list:
+            for last_idx_key_prefix in last_idx_key_prefix_list:
+                h_key_name = f"{last_idx_key_prefix}{app_type_item}.{mid}.{dt}"
+                redis_helper.del_keys(key_name=h_key_name)
+        # 小时级
+        h = datetime.now().hour
+        h_list = [h]
+        if h == 0:
+            h_list.append(23)
+        else:
+            h_list.append(h-1)
+        for redis_h in h_list:
+            for last_idx_key_prefix in last_idx_key_prefix_list:
+                h_key_name = f"{last_idx_key_prefix}{app_type_item}.{mid}.{redis_h}"
+                redis_helper.del_keys(key_name=h_key_name)