Merge branch 'feature_2023121211_liqian_recommend_data_task_opt' into test

region_rule_rank_h_by24h.py

@@ -487,6 +487,7 @@ def h_timer_check():
         now_h = datetime.datetime.now().hour
         now_min = datetime.datetime.now().minute
         log_.info(f"now_date: {datetime.datetime.strftime(now_date, '%Y%m%d%H')}")
+        redis_helper = RedisHelper()
         # 查看当天更新的数据是否已准备好
         h_data_count = data_check(project=project, table=table, now_date=now_date)
         if h_data_count > 0:
@@ -495,18 +496,21 @@ def h_timer_check():
             rank_by_24h(now_date=now_date, now_h=now_h, rule_params=rule_params,
                         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
+            )
+            log_.info(f"region_24h_data status update to '1' finished!")
         elif now_min > 40:
             log_.info('24h_recall data is None, use bottom data!')
             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
+            )
+            log_.info(f"region_24h_data status update to '1' finished!")
         else:
             # 数据没准备好，1分钟后重新检查
             Timer(60, h_timer_check).start()
-        redis_helper = RedisHelper()
-        redis_helper.set_data_to_redis(
-            key_name=config_.REGION_24H_DATA_STATUS, value='1', expire_time=2 * 3600
-        )
-        log_.info(f"region_24h_data status update to '1' finished!")
 
     except Exception as e:
         log_.error(f"地域分组24h数据更新失败, exception: {e}, traceback: {traceback.format_exc()}")

rule_rank_h_by_24h.py

@@ -486,29 +486,37 @@ def h_timer_check():
         log_.info(f"now_date: {datetime.strftime(now_date, '%Y%m%d%H')}")
         now_min = datetime.now().minute
         now_h = datetime.now().hour
+        redis_helper = RedisHelper()
         # 查看当前天级更新的数据是否已准备好
         h_data_count = h_data_check(project=project, table=table, now_date=now_date, now_h=now_h)
         if now_h == 23 or now_h < 8:
             log_.info(f'now_h = {now_h} use bottom data!')
             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
+            )
+            log_.info(f"rule_24h_data status update to '1' finished!")
         elif h_data_count > 0:
             log_.info(f'h_by24h_data_count = {h_data_count}')
             # 数据准备好，进行更新
             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
+            )
+            log_.info(f"rule_24h_data status update to '1' finished!")
         elif now_min > 40:
             log_.info('h_by24h_recall data is None, use bottom data!')
             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
+            )
+            log_.info(f"rule_24h_data status update to '1' finished!")
         else:
             # 数据没准备好，1分钟后重新检查
             Timer(60, h_timer_check).start()
-        redis_helper = RedisHelper()
-        redis_helper.set_data_to_redis(
-            key_name=config_.RULE_24H_DATA_STATUS, value='1', expire_time=2 * 3600
-        )
-        log_.info(f"rule_24h_data status update to '1' finished!")
 
     except Exception as e:
         log_.error(f"不区分地域24h数据更新失败, exception: {e}, traceback: {traceback.format_exc()}")

rule_rank_h_new.py

@@ -263,11 +263,16 @@ def h_timer_check():
         log_.info(f"now_date: {datetime.strftime(now_date, '%Y%m%d%H')}")
         now_min = datetime.now().minute
         now_h = datetime.now().hour
+        redis_helper = RedisHelper()
 
         if now_h == 0:
             log_.info(f'now_h = {now_h} use bottom data!')
             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
+            )
+            log_.info(f"rule_h_data status update to '1' finished!")
             return
         # 查看当前小时级更新的数据是否已准备好
         h_data_count = h_data_check(project=project, table=table, now_date=now_date)
@@ -276,18 +281,21 @@ 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
+            )
+            log_.info(f"rule_h_data status update to '1' finished!")
         elif now_min > 40:
             log_.info('h_recall data is None, use bottom data!')
             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
+            )
+            log_.info(f"rule_h_data status update to '1' finished!")
         else:
             # 数据没准备好，1分钟后重新检查
             Timer(60, h_timer_check).start()
-        redis_helper = RedisHelper()
-        redis_helper.set_data_to_redis(
-            key_name=config_.RULE_H_DATA_STATUS, value='1', expire_time=2 * 3600
-        )
-        log_.info(f"rule_h_data status update to '1' finished!")
 
     except Exception as e:
         log_.error(f"不区分地域小时级数据更新失败, exception: {e}, traceback: {traceback.format_exc()}")