From 30a869f6bbd18a9797ff080d5cc68317654796c7 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 09 六月 2025 19:05:49 +0800
Subject: [PATCH] bug修复
---
server/data_server.py | 4 ++++
strategy/test.py | 4 ++--
strategy/time_series_backtest.py | 2 +-
main.py | 2 +-
strategy/strategy_params_settings.py | 2 +-
api/outside_api_callback.py | 36 +++++++++++++++++++-----------------
6 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/api/outside_api_callback.py b/api/outside_api_callback.py
index 529a7e5..85655a4 100644
--- a/api/outside_api_callback.py
+++ b/api/outside_api_callback.py
@@ -46,9 +46,10 @@
result = strategy_params_settings.settings.to_json_str()
return {"code": 0, "data": result}
- def __on_get_env(self):
+ def __on_get_env(self, need_hsitory_data):
"""
鑾峰彇鐜淇℃伅
+ @param need_hsitory_data: 鏄惁闇�瑕佸巻鍙叉暟鎹�
@return:
"""
fdata = {}
@@ -56,22 +57,23 @@
fdata["real_time_data"] = RealTimeEnvInfo().to_dict()
# 鍘嗗彶鏁版嵁
fdata["history_data"] = {}
- if tool.get_now_time_str() < '16:00:00':
- # 濡傛灉鍦�16:00涔嬪墠閲囩敤褰撳墠鏃ユ湡
- day = tool.get_now_date_str()
- else:
- # 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩
- day = TradeDateManager().get_next_trade_day(tool.get_now_date_str())
- fdata["history_data"]["leading_limit_up_block_codes_count"] = env_info.get_leading_limit_up_block_codes_count(
- day)
+ if need_hsitory_data:
+ if tool.get_now_time_str() < '16:00:00':
+ # 濡傛灉鍦�16:00涔嬪墠閲囩敤褰撳墠鏃ユ湡
+ day = tool.get_now_date_str()
+ else:
+ # 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩
+ day = TradeDateManager().get_next_trade_day(tool.get_now_date_str())
+ fdata["history_data"]["leading_limit_up_block_codes_count"] = env_info.get_leading_limit_up_block_codes_count(
+ day)
- if tool.get_now_time_str() < '16:00:00':
- # 濡傛灉鍦�16:00涔嬪墠閲囩敤褰撳墠鏃ユ湡
- day = TradeDateManager().get_previous_trade_day(tool.get_now_date_str())
- else:
- # 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩
- day = tool.get_now_date_str()
- fdata["history_data"]["k_bars_count"] = env_info.get_history_k_bars(day)
+ if tool.get_now_time_str() < '16:00:00':
+ # 濡傛灉鍦�16:00涔嬪墠閲囩敤褰撳墠鏃ユ湡
+ day = TradeDateManager().get_previous_trade_day(tool.get_now_date_str())
+ else:
+ # 濡傛灉鍦�16:00涔嬪悗閲囩敤涓嬩竴涓氦鏄撴棩
+ day = tool.get_now_date_str()
+ fdata["history_data"]["k_bars_count"] = env_info.get_history_k_bars(day)
return {"code": 0, "data": fdata, "msg": "娴嬭瘯缁撴灉"}
def __on_update_leading_limit_up_datas(self):
@@ -102,7 +104,7 @@
if ctype == "get_settings":
result_json = self.__on_get_settings()
elif ctype == 'get_env':
- result_json = self.__on_get_env()
+ result_json = self.__on_get_env(data.get("history"))
elif ctype == 'update_leading_limit_up_datas':
result_json = self.__on_update_leading_limit_up_datas()
self.send_response(result_json, client_id, request_id)
diff --git a/main.py b/main.py
index 3688b87..ea2e387 100644
--- a/main.py
+++ b/main.py
@@ -60,7 +60,7 @@
huaxin_trade_api.run()
threading.Thread(target=test, daemon=True).start()
- test()
+ # test()
# -------鍚姩L2 market璁㈤槄------
__run_l2_market_subscript()
diff --git a/server/data_server.py b/server/data_server.py
index c0b1285..5f94427 100644
--- a/server/data_server.py
+++ b/server/data_server.py
@@ -45,6 +45,10 @@
params = self.__parse_request()
logger_debug.info("upload_block_in_datas:{}", f"{params}")
result_str = json.dumps({"code": 0})
+ elif url.path == "upload_limit_up_list":
+ params = self.__parse_request()
+ logger_debug.info("upload_limit_up_list:{}", f"{params}")
+ result_str = json.dumps({"code": 0})
else:
pass
self.__send_response(result_str)
diff --git a/strategy/strategy_params_settings.py b/strategy/strategy_params_settings.py
index dd86b73..8e415d9 100644
--- a/strategy/strategy_params_settings.py
+++ b/strategy/strategy_params_settings.py
@@ -49,7 +49,7 @@
# 鏄惁鍙拱浠婃棩娑ㄥ仠杩囩殑绁�
self.can_buy_limited_up = False
# 鏈�浣庡紑鐩樻定骞�
- self.min_open_rate = -0.21
+ self.min_open_rate = -0.03
# 鍙拱鐨勬定骞呮瘮渚�
self.avaiable_rates = (-0.03, 0.07)
# 浠婃棩娑ㄥ仠浠烽渶绐佺牬XX鏃ユ渶楂樹环,None琛ㄧず姝ゆ潯鏁版嵁涓嶇敓鏁�
diff --git a/strategy/test.py b/strategy/test.py
index 8f80074..d0e9f6b 100644
--- a/strategy/test.py
+++ b/strategy/test.py
@@ -20,6 +20,6 @@
if __name__ == "__main__":
print("======3涓エ娑ㄥ仠涔嬪悗涔�+寮�鐩樹环>=-3")
statistic_average(r"C:\Users\Administrator\Desktop\3涓エ娑ㄥ仠涔嬪悗涔�.txt")
- print("======3涓エ娑ㄥ仠涔嬪悗涔�+寮�鐩樹环>=-2")
- statistic_average(r"C:\Users\Administrator\Desktop\3涓エ娑ㄥ仠涔嬪悗涔癬寮�鐩樻定骞�-2浠ヤ笂.txt")
+ print("======3涓エ娑ㄥ仠涔嬪悗涔�+涓嶉檺寮�鐩樻定骞�+3涓定鍋滀箣鍚庡ぇ鍗曟墦鎶�")
+ statistic_average(r"C:\Users\Administrator\Desktop\3涓エ娑ㄥ仠涔嬪悗涔癬涓嶉檺寮�鐩樻定骞�.txt")
diff --git a/strategy/time_series_backtest.py b/strategy/time_series_backtest.py
index 97215ee..c837a59 100644
--- a/strategy/time_series_backtest.py
+++ b/strategy/time_series_backtest.py
@@ -780,7 +780,7 @@
if __name__ == "__main__":
back_test_dict = {}
# days = ["2025-05-06", "2025-05-07", "2025-05-08", "2025-05-09", "2025-05-12", "2025-05-13", "2025-05-14",
- # "2025-05-15", "2025-05-16", "2025-05-19", "2025-05-20"]
+ # "2025-05-15", "2025-05-16", "2025-05-19", "2025-05-20", "2025-05-21", "2025-05-22"]
days = ["2025-05-12", "2025-05-13", "2025-05-14", "2025-05-15", "2025-05-16", "2025-05-19", "2025-05-20",
"2025-05-21", "2025-05-22", "2025-05-23", "2025-05-26", "2025-05-27", "2025-05-28", "2025-05-29",
"2025-05-30", "2025-06-03", "2025-06-04", "2025-06-05", "2025-06-06", "2025-06-09"]
--
Gitblit v1.8.0