update

recommend_region_data_status_update.py

@@ -1,3 +1,4 @@
+import datetime
 from config import set_config
 from log import Log
 from db_helper import RedisHelper
@@ -5,14 +6,16 @@ from db_helper import RedisHelper
 config_, _ = set_config()
 log_ = Log()
 
+now_date = datetime.datetime.today()
+log_.info(f"now_date: {datetime.datetime.strftime(now_date, '%Y%m%d%H')}")
 redis_helper = RedisHelper()
 redis_helper.set_data_to_redis(
-    key_name=config_.RULE_24H_DATA_STATUS, value='0', expire_time=2 * 3600
+    key_name=f"{config_.RULE_24H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}", value='0', expire_time=2 * 3600
 )
 redis_helper.set_data_to_redis(
-    key_name=config_.REGION_24H_DATA_STATUS, value='0', expire_time=2 * 3600
+    key_name=f"{config_.REGION_24H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}", value='0', expire_time=2 * 3600
 )
 redis_helper.set_data_to_redis(
-    key_name=config_.RULE_H_DATA_STATUS, value='0', expire_time=2 * 3600
+    key_name=f"{config_.RULE_H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}", value='0', expire_time=2 * 3600
 )
 log_.info(f"recommend data status update to initial '0' finished!")

region_rule_rank_h.py

@@ -804,9 +804,9 @@ def dup_to_redis_with_timecheck(h_video_ids, now_date, now_h, rule_key, h_rule_k
     # 获取并判断其他数据表更新状态
     redis_helper = RedisHelper()
     while True:
-        rule_24h_status = redis_helper.get_data_from_redis(key_name=config_.RULE_24H_DATA_STATUS)
-        region_24h_status = redis_helper.get_data_from_redis(key_name=config_.REGION_24H_DATA_STATUS)
-        rule_h_status = redis_helper.get_data_from_redis(key_name=config_.RULE_H_DATA_STATUS)
+        rule_24h_status = redis_helper.get_data_from_redis(key_name=f"{config_.RULE_24H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}")
+        region_24h_status = redis_helper.get_data_from_redis(key_name=f"{config_.REGION_24H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}")
+        rule_h_status = redis_helper.get_data_from_redis(key_name=f"{config_.RULE_H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}")
         if rule_24h_status == '1' and region_24h_status == '1' and rule_h_status == '1':
             # log_.info("dup data start ....")
             # ##### 去重更新不区分地域小时级列表，并另存为redis中

region_rule_rank_h_by24h.py

@@ -497,7 +497,7 @@ def h_timer_check():
                         project=project, table=table, region_code_list=region_code_list)
             log_.info(f"region_24h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.REGION_24H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.REGION_24H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"region_24h_data status update to '1' finished!")
         elif now_min > 40:
@@ -505,7 +505,7 @@ def h_timer_check():
             h_rank_bottom(now_date=now_date, now_h=now_h, rule_params=rule_params, region_code_list=region_code_list)
             log_.info(f"region_24h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.REGION_24H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.REGION_24H_DATA_STATUS}:{datetime.datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"region_24h_data status update to '1' finished!")
         else:

rule_rank_h_by_24h.py

@@ -494,7 +494,7 @@ def h_timer_check():
             h_rank_bottom(now_date=now_date, now_h=now_h, rule_params=rule_params)
             log_.info(f"24h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.RULE_24H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.RULE_24H_DATA_STATUS}:{datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"rule_24h_data status update to '1' finished!")
         elif h_data_count > 0:
@@ -503,7 +503,7 @@ def h_timer_check():
             rank_by_h(now_date=now_date, now_h=now_h, rule_params=rule_params, project=project, table=table)
             log_.info(f"24h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.RULE_24H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.RULE_24H_DATA_STATUS}:{datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"rule_24h_data status update to '1' finished!")
         elif now_min > 40:
@@ -511,7 +511,7 @@ def h_timer_check():
             h_rank_bottom(now_date=now_date, now_h=now_h, rule_params=rule_params)
             log_.info(f"24h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.RULE_24H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.RULE_24H_DATA_STATUS}:{datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"rule_24h_data status update to '1' finished!")
         else:

rule_rank_h_new.py

@@ -270,7 +270,7 @@ def h_timer_check():
             h_rank_bottom(now_date=now_date, now_h=now_h, rule_params=rule_params)
             log_.info(f"h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.RULE_H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.RULE_H_DATA_STATUS}:{datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"rule_h_data status update to '1' finished!")
             return
@@ -282,7 +282,7 @@ def h_timer_check():
             rank_by_h(now_date=now_date, now_h=now_h, rule_params=rule_params, project=project, table=table)
             log_.info(f"h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.RULE_H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.RULE_H_DATA_STATUS}:{datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"rule_h_data status update to '1' finished!")
         elif now_min > 40:
@@ -290,7 +290,7 @@ def h_timer_check():
             h_rank_bottom(now_date=now_date, now_h=now_h, rule_params=rule_params)
             log_.info(f"h_data end!")
             redis_helper.set_data_to_redis(
-                key_name=config_.RULE_H_DATA_STATUS, value='1', expire_time=2 * 3600
+                key_name=f"{config_.RULE_H_DATA_STATUS}:{datetime.strftime(now_date, '%Y%m%d%H')}", value='1', expire_time=2 * 3600
             )
             log_.info(f"rule_h_data status update to '1' finished!")
         else: