From eafd0f0b39067068492bae5e8261bf975a19b2d7 Mon Sep 17 00:00:00 2001
From: jingboyitiji <jingboyitiji@admin.com>
Date: Fri, 14 Mar 2025 10:27:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8F=AA=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=8C=E5=8E=9F=E6=B2=B9=E5=85=AB=E5=A4=A7?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E9=A2=84=E6=B5=8B=E6=89=A7=E8=A1=8C=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/nerulforcastmodels.py |  3 ++-
 原油八大维度预测任务.py      | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/models/nerulforcastmodels.py b/models/nerulforcastmodels.py
index 2cd550c..e7084e2 100644
--- a/models/nerulforcastmodels.py
+++ b/models/nerulforcastmodels.py
@@ -199,7 +199,8 @@ def ex_Model(df, horizon, input_size, train_steps, val_check_steps, early_stop_p
         nf_preds = nf_preds.reset_index()
         # 保存模型
         # 生成文件名，按时间 精确到分
-        filename = f'{settings}--{now}.joblib'
+        # filename = f'{settings}--{now}.joblib'
+        filename = f'{settings}.joblib'
         # 文件名去掉冒号
         filename = filename.replace(':', '-')  # 替换冒号
         dump(nf, os.path.join(config.dataset, filename))
diff --git a/原油八大维度预测任务.py b/原油八大维度预测任务.py
index f109f6c..6d9ede4 100644
--- a/原油八大维度预测任务.py
+++ b/原油八大维度预测任务.py
@@ -9,15 +9,15 @@ import time
 def run_predictions(target_date):
     """执行三个预测脚本"""
     scripts = [
-        "main_yuanyou.py",
+        # "main_yuanyou.py",
         "main_yuanyou_zhoudu.py",
         "main_yuanyou_yuedu.py"
     ]
 
-    # 合并命令为单个进程执行
-    command = ["python"]
-    command.extend(scripts)
-    subprocess.run(command, check=True)
+    # 依次执行每个脚本
+    for script in scripts:
+        command = ["python", script]
+        subprocess.run(command, check=True)
 
 
 def is_weekday(date):
@@ -26,7 +26,9 @@ def is_weekday(date):
 
 
 if __name__ == "__main__":
-    start_date = datetime.date(2025, 3, 13)
+    # start_date = datetime.date(2025, 3, 13)
+    # 开始时间取当前时间
+    start_date = datetime.date.today()
     end_date = datetime.date(2100, 12, 31)
 
     current_date = start_date
@@ -34,7 +36,7 @@ if __name__ == "__main__":
         if is_weekday(current_date):
             # 等待到目标日期的7点
             target_time = datetime.datetime.combine(
-                current_date, datetime.time(9, 40))
+                current_date, datetime.time(10, 25))
             while datetime.datetime.now() < target_time:
                 time.sleep(60)  # 每分钟检查一次
                 print(f"等待到 {target_time} 开始执行任务")