From 7e71c8e1c8cb7584d3c14429bb8fe34118e693b7 Mon Sep 17 00:00:00 2001
From: jingboyitiji <jingboyitiji@admin.com>
Date: Tue, 11 Mar 2025 17:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=B2=B9=E5=91=A8=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config_jingbo_zhoudu.py |  2 +-
 main_yuanyou_zhoudu.py  | 30 ++++++++++--------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/config_jingbo_zhoudu.py b/config_jingbo_zhoudu.py
index ec55b8a..913df5c 100644
--- a/config_jingbo_zhoudu.py
+++ b/config_jingbo_zhoudu.py
@@ -157,7 +157,7 @@ table_name = 'v_tbl_crude_oil_warning'
 
 
 # 开关
-is_train = False  # 是否训练
+is_train = True  # 是否训练
 is_debug = False  # 是否调试
 is_eta = False  # 是否使用eta接口
 is_market = True  # 是否通过市场信息平台获取特征 ,在is_eta 为true 的情况下生效
diff --git a/main_yuanyou_zhoudu.py b/main_yuanyou_zhoudu.py
index 8718bbc..ccddeb2 100644
--- a/main_yuanyou_zhoudu.py
+++ b/main_yuanyou_zhoudu.py
@@ -65,7 +65,6 @@ global_config.update({
     'edbdatapushurl': edbdatapushurl,
     'edbdeleteurl': edbdeleteurl,
     'edbbusinessurl': edbbusinessurl,
-    'ClassifyId':   ClassifyId,
     'classifylisturl': classifylisturl,
 
     # 数据库配置
@@ -111,30 +110,21 @@ def predict_main():
     返回:
         None
     """
-    global end_time
-    signature = BinanceAPI(APPID, SECRET)
-    etadata = EtaReader(signature=signature,
-                        classifylisturl=classifylisturl,
-                        classifyidlisturl=classifyidlisturl,
-                        edbcodedataurl=edbcodedataurl,
-                        edbcodelist=edbcodelist,
-                        edbdatapushurl=edbdatapushurl,
-                        edbdeleteurl=edbdeleteurl,
-                        edbbusinessurl=edbbusinessurl
-                        )
+    end_time = global_config['end_time']
     # 获取数据
     if is_eta:
         logger.info('从eta获取数据...')
         signature = BinanceAPI(APPID, SECRET)
         etadata = EtaReader(signature=signature,
-                            classifylisturl=classifylisturl,
-                            classifyidlisturl=classifyidlisturl,
-                            edbcodedataurl=edbcodedataurl,
-                            edbcodelist=edbcodelist,
-                            edbdatapushurl=edbdatapushurl,
-                            edbdeleteurl=edbdeleteurl,
-                            edbbusinessurl=edbbusinessurl,
-                            )
+                classifylisturl=global_config['classifylisturl'],
+                classifyidlisturl=global_config['classifyidlisturl'],
+                edbcodedataurl=global_config['edbcodedataurl'],
+                edbcodelist=global_config['edbcodelist'],
+                edbdatapushurl=global_config['edbdatapushurl'],
+                edbdeleteurl=global_config['edbdeleteurl'],
+                edbbusinessurl=global_config['edbbusinessurl'],
+                classifyId=global_config['ClassifyId'],
+            )
         df_zhibiaoshuju, df_zhibiaoliebiao = etadata.get_eta_api_yuanyou_data(
             data_set=data_set, dataset=dataset)  # 原始数据，未处理