From cbf0eb16d93a5c7ebfa5196c012cde695166647a Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期二, 27 五月 2025 14:21:03 +0800
Subject: [PATCH] 1.充分交易量公式 修改参数 2.策略中新增且打印有意购买列表 3.GUI新增及修改 行情板块强度模块 的 日志数据整理 与 data_server 相关的响应修改 4.
---
strategy/basic_methods.py | 6 +++---
data_server.py | 6 +++---
strategy/buying_strategy.py | 2 ++
strategy/kpl_api.py | 2 +-
main.py | 3 ++-
strategy/data_cache.py | 7 +++++--
strategy/kpl_data_manager.py | 10 +++++-----
7 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/data_server.py b/data_server.py
index 586e0ee..84a6394 100644
--- a/data_server.py
+++ b/data_server.py
@@ -17,7 +17,7 @@
from log_module import log_export, async_log_util
from log_module.log import hx_logger_l2_transaction, logger_debug, logger_request_api
from strategy import data_cache
-from strategy.kpl_data_manager import KPLStockOfMarketsPlateLogManager, KPLMarketStockHeatLogManager
+from strategy.kpl_data_manager import KPLMarketsSiftPlateLogManager, KPLMarketStockHeatLogManager
from strategy.trade_setting import TradeSetting
from trade import huaxin_trade_api, huaxin_trade_data_update
from trade.huaxin_trade_record_manager import DelegateRecordManager, DealRecordManager, MoneyManager, PositionManager
@@ -195,7 +195,7 @@
# 鑾峰彇鏉垮潡寮哄害鏁版嵁
elif url.path == "/load_get_kpl_market_sift_plate":
# 鍔犺浇鏁版嵁
- KPLStockOfMarketsPlateLogManager().load_data()
+ KPLMarketsSiftPlateLogManager().load_data()
response_data = json.dumps({"code": 0, "msg": "鏆傛棤鍐呭"})
elif url.path == "/get_kpl_market_sift_plate":
# 鑾峰彇寮�鐩樺暒娴佸叆鏉垮潡璇︾粏淇℃伅
@@ -204,7 +204,7 @@
time_str = params_dict.get("time")
if not time_str:
time_str = tool.get_now_time_str()
- fdatas = KPLStockOfMarketsPlateLogManager().get_filter_log_datas()
+ fdatas = KPLMarketsSiftPlateLogManager().get_filter_log_datas()
response_data = json.dumps({"code": 1, "msg": "鏆傛棤鍐呭"})
for i in range(len(fdatas) - 1, -1, -1):
if fdatas[i][0] <= time_str:
diff --git a/main.py b/main.py
index 4efb767..8ff7860 100644
--- a/main.py
+++ b/main.py
@@ -243,7 +243,8 @@
# 鍔犺浇寮�鐩樺暒鏉垮潡鏃ュ織鏁版嵁
- kpl_data_manager.KPLStockOfMarketsPlateLogManager()
+ kpl_data_manager.KPLMarketsSiftPlateLogManager()
+ kpl_data_manager.KPLMarketStockHeatLogManager()
# 鍚姩寮傛鏃ュ織
threading.Thread(target=async_log_util.run_sync, daemon=True).start()
diff --git a/strategy/basic_methods.py b/strategy/basic_methods.py
index b9defd5..8dd866f 100644
--- a/strategy/basic_methods.py
+++ b/strategy/basic_methods.py
@@ -211,10 +211,10 @@
# 鍏呭垎浜ゆ槗閲忓叕寮� 鐢ㄤ簬璁＄畻鏃ュ唴娑ㄥ箙娈电悊璁虹殑瀹夊叏浜ゆ槗閲忓��
def sufficient_volume(current_volume, yesterday_volume, today_growth):
if today_growth > 0:
- if current_volume < yesterday_volume * today_growth:
- return False
- else:
+ if current_volume > yesterday_volume * 0.8 * today_growth:
return True
+ else:
+ return False
# 璁＄畻 濮斾拱鍜屽鍗栫殑姣斾緥鍑芥暟(鑾峰彇涔扮洏寮哄害鏁版嵁)銆愭帢閲戞暟鎹粨鏋勩��
diff --git a/strategy/buying_strategy.py b/strategy/buying_strategy.py
index d9b66dd..efa5979 100644
--- a/strategy/buying_strategy.py
+++ b/strategy/buying_strategy.py
@@ -384,6 +384,8 @@
logger_info(
f"銆愪笉鍒┿�戝綋鏃ユ垚浜ら噺灏忎簬鏄ㄦ棩鎴愪氦閲忕殑{ratios}鍊嶏紒涓嶄拱锛侊紒鍏徃鍚嶇О锛歿k_line_data[0]['sec_name']}锛屽綋鏃ュ綋鏃舵�绘垚浜ら噺:{current_volume},鏈�鏂颁环: {current_price}")
return
+ data_cache.willing_buy_list.add_buy_code(k_line_data[0]['sec_name'])
+ logger_info(f"褰撳墠鏈夋剰璐拱锛歿k_line_data[0]['sec_name']}锛屾湁鎰忚喘涔板垪琛細{data_cache.willing_buy_list}")
if len(intersection_plate) > 0:
logger_info(
f"銆愪笉鍒┿�戝悓姒傚康鍙拱涓�娆★紝涓嶄拱浜嗭紝鍏徃鍚嶇О锛歿k_line_data[0]['sec_name']}锛岄噸澶嶇浉浜ゆ蹇�==={intersection_plate}")
diff --git a/strategy/data_cache.py b/strategy/data_cache.py
index dda7250..d573437 100644
--- a/strategy/data_cache.py
+++ b/strategy/data_cache.py
@@ -273,7 +273,10 @@
# 鏈�鏂版垚浜や环鏍�
latest_deal_price_dict = {}
-logging.info(f"鍏ㄥ眬鍒濆鍖栨暟鎹� 瀹屾垚銆娿�娿�� - {os.getpid()}")
-
# 澶у崟鎴愪氦鏁版嵁: {"浠ｇ爜":[澶у崟鏁版嵁1,澶у崟鏁版嵁2,...]}
big_order_deal_dict = {}
+
+# 鏈夋剰璐拱鐨勮偂绁ㄥ悕绉板垪琛�
+willing_buy_list = []
+
+logging.info(f"鍏ㄥ眬鍒濆鍖栨暟鎹� 瀹屾垚銆娿�娿�� - {os.getpid()}")
diff --git a/strategy/kpl_api.py b/strategy/kpl_api.py
index 85290e8..7f73faa 100644
--- a/strategy/kpl_api.py
+++ b/strategy/kpl_api.py
@@ -15,7 +15,7 @@
from strategy import data_cache
from strategy import basic_methods
-from strategy.kpl_data_manager import KPLStockOfMarketsPlateLogManager
+# from strategy.kpl_data_manager import KPLMarketsSiftPlateLogManager
from trade import middle_api_protocol
from utils import hx_qc_value_util, tool
diff --git a/strategy/kpl_data_manager.py b/strategy/kpl_data_manager.py
index 6e2cd55..fca6363 100644
--- a/strategy/kpl_data_manager.py
+++ b/strategy/kpl_data_manager.py
@@ -2,9 +2,9 @@
from log_module.log import logger_stock_of_markets_plate, logger_debug, logger_kpl_market_sift_plate
from utils import tool
-# 寮�鐩樺暒涓偂寮哄害鏃ュ織绠＄悊
+# 寮�鐩樺暒鏉垮潡寮哄害鏃ュ織绠＄悊
@tool.singleton
-class KPLStockOfMarketsPlateLogManager:
+class KPLMarketsSiftPlateLogManager:
"""
绮鹃�夋祦鍏ユ澘鍧椾笌鏉垮潡浠ｇ爜鏃ュ織绠＄悊
"""
@@ -15,12 +15,12 @@
def __load_data(self):
if tool.get_now_time_str() > '13:10:00':
- logger_debug.info("KPLMarketStockHeatLogManager 寮�濮嬪姞杞芥暟鎹�")
+ logger_debug.info("KPLMarketsSiftPlateLogManager 寮�濮嬪姞杞芥暟鎹�")
datas = log_export.load_market_stock_heat()
for data in datas:
# (鍙戠敓鏃堕棿,[鍑�娴佸叆鏉垮潡], {"鏉垮潡":(浠ｇ爜, 鍚嶇О, 娑ㄥ箙)})
self.__filter_log_datas.append(self.__filter_origin_data(data))
- logger_debug.info("KPLMarketStockHeatLogManager 鏁版嵁鍔犺浇瀹屾垚锛歿}", len(self.__filter_log_datas))
+ logger_debug.info("KPLMarketsSiftPlateLogManager 鏁版嵁鍔犺浇瀹屾垚锛歿}", len(self.__filter_log_datas))
def load_data(self):
self.__load_data()
@@ -72,4 +72,4 @@
if __name__ == '__main__':
- KPLStockOfMarketsPlateLogManager()
+ KPLMarketStockHeatLogManager()
--
Gitblit v1.8.0