liqian 1 рік тому
батько
коміт
bfe5d27a9d
3 змінених файлів з 9 додано та 11 видалено
  1. 2 2
      ad_user_data_with_out_update.py
  2. 5 7
      ad_video_data_update.py
  3. 2 2
      config.py

+ 2 - 2
ad_user_data_with_out_update.py

@@ -84,8 +84,8 @@ def update_users_data(project, table, dt, update_params):
 def timer_check():
     try:
         update_params = config_.AD_USER_WITH_OUT_PARAMS
-        project = config_.ad_model_data['users_data'].get('project')
-        table = config_.ad_model_data['users_data'].get('table')
+        project = config_.ad_model_data['users_data_with_out'].get('project')
+        table = config_.ad_model_data['users_data_with_out'].get('table')
         now_date = datetime.datetime.today()
         dt = datetime.datetime.strftime(now_date, '%Y%m%d')
         log_.info(f"now_date: {dt}")

+ 5 - 7
ad_video_data_update.py

@@ -246,7 +246,7 @@ def predict_video_out_rate(video_initial_df, dt, data_key, data_param, top10_abn
     log_.info(f"redis_data count: {len(redis_data)}")
     if len(redis_data) > 0:
         redis_helper = RedisHelper()
-        # redis_helper.add_data_with_zset(key_name=key_name, data=redis_data, expire_time=2 * 24 * 3600)
+        redis_helper.add_data_with_zset(key_name=key_name, data=redis_data, expire_time=2 * 24 * 3600)
     return video_df
 
 
@@ -271,16 +271,14 @@ def timer_check(dt, video_key, video_params, top10_abnormal_videos):
         log_.info(f"ad video data count = {data_count}")
         # 数据准备好,进行更新
         if video_key == 'videos_data_alladtype':
-            # update_videos_data_new(project=project, table=table, dt=dt, update_params=video_params,
-            #                        top10_abnormal_videos=top10_abnormal_videos)
-            pass
+            update_videos_data_new(project=project, table=table, dt=dt, update_params=video_params,
+                                   top10_abnormal_videos=top10_abnormal_videos)
         elif video_key == 'videos_data_with_out_alladtype':
             update_videos_data_with_out(project=project, table=table, dt=dt, update_params=video_params,
                                         top10_abnormal_videos=top10_abnormal_videos)
         else:
-            # update_videos_data(project=project, table=table, dt=dt, update_params=video_params,
-            #                    top10_abnormal_videos=top10_abnormal_videos)
-            pass
+            update_videos_data(project=project, table=table, dt=dt, update_params=video_params,
+                               top10_abnormal_videos=top10_abnormal_videos)
         log_.info(f"video_key = {video_key} ad video data update end!")
         msg_list = [
             f"env: rov-offline {config_.ENV_TEXT}",

+ 2 - 2
config.py

@@ -2285,8 +2285,8 @@ class ProductionConfig(BaseConfig):
 
 def set_config():
     # 获取环境变量 ROV_OFFLINE_ENV
-    # env = os.environ.get('ROV_OFFLINE_ENV')
-    env = 'dev'
+    env = os.environ.get('ROV_OFFLINE_ENV')
+    # env = 'dev'
     if env is None:
         # log_.error('ENV ERROR: is None!')
         return