From c05044c53a5d0213ef33b2b3bdbb57a328300ad2 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 17 六月 2025 17:31:39 +0800
Subject: [PATCH] ‘功能完善
---
strategy/strategy_manager.py | 2 +-
strategy/strategy_variable_factory.py | 7 ++-----
main.py | 3 +--
api/outside_api_callback.py | 16 ++++++++++++++--
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/api/outside_api_callback.py b/api/outside_api_callback.py
index 309b376..75d1585 100644
--- a/api/outside_api_callback.py
+++ b/api/outside_api_callback.py
@@ -3,10 +3,12 @@
import os
import threading
+import constant
+
from api.outside_api_command_manager import ActionCallback
from huaxin_client import l1_subscript_codes_manager
from huaxin_client.client_network import SendResponseSkManager
-from strategy import strategy_params_settings, env_info
+from strategy import strategy_params_settings, env_info, strategy_manager
from strategy.env_info import RealTimeEnvInfo
from strategy.strategy_variable_factory import DataLoader
from third_data.history_k_data_manager import TradeDateManager
@@ -116,7 +118,7 @@
else:
# 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩
day = TradeDateManager().get_next_trade_day(tool.get_now_date_str())
- __DataLoader = DataLoader(day)
+ __DataLoader = DataLoader(self.now_day)
threading.Thread(target=lambda: update(), daemon=True).start()
return {"code": 0}
@@ -137,6 +139,13 @@
threading.Thread(target=lambda: update(), daemon=True).start()
return {"code": 0}
+ def __on_init_data(self):
+ try:
+ strategy_manager.low_suction_strtegy.load_data()
+ return {"code": 0}
+ except Exception as e:
+ return {"code": 1, "msg": str(e)}
+
def OnCommonRequest(self, client_id, request_id, data):
ctype = data["ctype"]
result_json = {}
@@ -154,4 +163,7 @@
elif ctype == 'update_kpl_code_jx_blocks_datas':
# 鏇存柊寮�鐩樺暒绮鹃�夋暟鎹�
result_json = self.__on_update_kpl_code_jx_blocks_datas()
+ elif ctype == 'init_datas':
+ # 鍒濆鍖栨暟鎹�
+ result_json = self.__on_init_data()
self.send_response(result_json, client_id, request_id)
diff --git a/main.py b/main.py
index 894d869..3e73088 100644
--- a/main.py
+++ b/main.py
@@ -106,7 +106,6 @@
# ----鍒濆鍖�------------
__init()
-
# 鍒濆鍖栨暟鎹�
strategy_manager.low_suction_strtegy = strategy_manager.LowSuctionStrategy(tool.get_now_date_str())
logger_system.info("鍒濆鍖栫瓥鐣ュ璞℃垚鍔�")
@@ -115,4 +114,4 @@
# -------鍚姩L2 market璁㈤槄------
__run_l2_market_subscript()
- print("鍚姩瀹屾垚")
+ logger_system.info("绯荤粺缁撴潫")
diff --git a/strategy/strategy_manager.py b/strategy/strategy_manager.py
index 9195236..0f2d336 100644
--- a/strategy/strategy_manager.py
+++ b/strategy/strategy_manager.py
@@ -151,7 +151,7 @@
self.scripts = scripts
self.settings = settings
- self.data_loader = DataLoader(self.now_day, cache_path=f"{constant.get_path_prefix()}/datas")
+ self.data_loader = DataLoader(self.now_day)
self.__LowSuctionOriginDataExportManager = LowSuctionOriginDataExportManager(self.now_day)
if need_load_data:
self.load_data()
diff --git a/strategy/strategy_variable_factory.py b/strategy/strategy_variable_factory.py
index 650a949..7a29a7e 100644
--- a/strategy/strategy_variable_factory.py
+++ b/strategy/strategy_variable_factory.py
@@ -22,7 +22,7 @@
鏁版嵁鍔犺浇鍣ㄧ被锛岀敤浜庨泦涓鐞嗙瓥鐣ュ彉閲忔墍闇�鐨勫悇绫绘暟鎹姞杞介�昏緫
"""
- def __init__(self, now_day, cache_path="D:/datas"):
+ def __init__(self, now_day, cache_path=f"{constant.get_path_prefix()}/datas"):
"""
鍒濆鍖栨暟鎹姞杞藉櫒
:param now_day: 褰撳墠鏃ユ湡锛屾牸寮忎负"2025-01-01"
@@ -658,13 +658,10 @@
plates = ["澶╃劧姘�", "鍐涘伐"]
print("==========鏂伴鏉�=======")
for p in plates:
- codes = [x for x in results.get(p) ] # if get_zylt(x) < 31e8
+ codes = [x for x in results.get(p)] # if get_zylt(x) < 31e8
print("======", p)
for code in codes:
print("\t\t", code, gpcode_manager.CodesNameManager().get_code_name(code))
-
-
-
if __name__ == "__main__":
--
Gitblit v1.8.0