From f1b3c7566924a00e86e63c55167bbda91f796716 Mon Sep 17 00:00:00 2001
From: admin <admin@example.com>
Date: 星期一, 16 六月 2025 14:40:26 +0800
Subject: [PATCH] 1.修复自由市值超100亿的大单判断逻辑BUG 2.无概念有强度逻辑简化
---
main.py | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/main.py b/main.py
index 0b95ef7..4c27122 100644
--- a/main.py
+++ b/main.py
@@ -22,6 +22,7 @@
selling_strategy
from huaxin_client import l2_market_client, l2_client, trade_client
from log_module import async_log_util, log
+from strategy.order_methods import TodayBuyCodeManager
from trade import huaxin_trade_data_update, huaxin_trade_api
from utils import hx_qc_value_util, huaxin_util, juejin_api, tool
@@ -67,19 +68,9 @@
local_data_management.read_local_K_line_data()
# 璇诲彇鏈湴涓偂鎵�灞炴澘鍧楁暟鎹� 骞舵洿鏂板埌data_cache
local_data_management.read_local_all_stocks_plate_data()
+ # 鍒濆鍖栨媺鍙栧綋鏃ヤ拱鍏ヤ唬鐮�
+ TodayBuyCodeManager()
- # todo 2025-03-25 娴嬭瘯鏃犺鍗冲彲鍒犻櫎涓嬮儴娉ㄩ噴
- # # 鍏堜娇鐢╦son.load()鐩存帴浠庢枃浠朵腑璇诲彇銆愬凡缁忓瓨鍌ㄥ湪鏈湴鐨凨绾挎寚鏍囧睘鎬у瓧鍏搞�戝苟瑙ｆ瀽JSON鏁版嵁
- # if os.path.exists(constant.K_BARS_PATH):
- # with open(constant.K_BARS_PATH, 'r', encoding='utf-8') as f:
- # data_cache.all_stocks_all_K_line_property_dict = json.load(f)
- # print(
- # f"data_cache.all_stocks_all_K_line_property_dict鐨勪釜鏁�==={len(data_cache.all_stocks_all_K_line_property_dict)}")
-
- # # 鑾峰彇鐩爣鏍囩殑K绾�---鍒濆鍖�
- # all_K_line.main_index_k_line_history.init(data_cache.DataCache().today_date, data_cache.DataCache().next_trading_day, data_cache.DataCache().main_index_stocks)
- # # 鐩存帴璋冪敤涓昏鎸囨暟K绾垮啓鍏ユ湰鍦版枃浠�
- # all_K_line.main_index_k_line_dict_write()
# 绗竴姝ワ細鍒濆鍖朿ontext鍑芥暟锛屽苟寮�鍚幏鍙栧疄鏃舵暟鎹殑绾跨▼
@@ -119,7 +110,8 @@
def get_market_sift_plate_its_stock_power_process(market_sift_plate_stock_dict):
# print(f"鍥炶皟鎴愬姛===绮鹃�夋澘鍧楄偂绁ㄥ己搴︽暟鎹洿鏂�==={market_sift_plate_stock_dict}")
# logger_kpl_jingxuan_in.info(f"{market_sift_plate_stock_dict}")
- data_cache.market_sift_plate_stock_dict = market_sift_plate_stock_dict
+ if market_sift_plate_stock_dict:
+ data_cache.market_sift_plate_stock_dict = market_sift_plate_stock_dict
# 鏉垮潡寮哄害涓嬩釜鑲″己搴︾嚎绋�
threading.Thread(target=plate_strength_analysis.get_market_sift_plate_its_stock_power_process,
@@ -160,7 +152,8 @@
:return:
"""
if datas:
- logger_debug.debug(f"{code} - L2閫愮瑪鎴愪氦涓婃姤锛歿len(datas)}")
+ start_time = time.time()
+ # logger_debug.debug(f"{code} - L2閫愮瑪鎴愪氦涓婃姤锛歿len(datas)}")
price, time_str = datas[-1][1], huaxin_util.convert_time(datas[-1][3])
try:
# 鑾峰彇鏈�杩戠殑鎴愪氦浠�
@@ -175,7 +168,7 @@
limit_up_price = tool.get_limit_up_price(code, self.__pre_close_price_dict[code])
if code in self.__last_price_dict:
if abs(limit_up_price - self.__last_price_dict[code]) < 0.0001 < abs(limit_up_price - price):
- # TODO 澶勭悊鐐告澘閫昏緫
+ # 澶勭悊鐐告澘閫昏緫
# 鐩戝惉浜嗙偢鏉夸簡瑕佸仛鐨勫嚱鏁�
try:
selling_strategy.explosion_strategy(code)
@@ -186,6 +179,11 @@
logger_debug.exception(e)
finally:
self.__last_price_dict[code] = price
+ data_cache.latest_deal_price_dict[code] = price
+ use_time = time.time() - start_time
+ if use_time > 0.1:
+ logger_debug.warning(f"L2閫愮瑪鎴愪氦澶勭悊鑰楁椂锛歿use_time} 鏈�鍚庝竴鏉℃暟鎹細{datas[-1]}")
+
def OnMarketData(self, code, datas):
# logger_debug.info(f"鏀跺埌L2Market鏁版嵁锛歿datas}")
@@ -195,9 +193,10 @@
# 瀹炴椂L2涔�1鎴愪氦閲�
def OnRealTimeBuy1Info(self, code, buy1_info):
+ pass
# buy1_info: [涔�1鏃堕棿,涔�1浠锋牸, 鍘熷涔�1閲�, 瀹炴椂涔�1閲廬
# 鏈�缁堢殑涔�1涓猴細 鍘熷涔�1閲�+瀹炴椂涔�1閲�
- async_log_util.info(logger_debug, f"OnRealTimeBuy1Info锛歿code}-{buy1_info}")
+ # async_log_util.info(logger_debug, f"OnRealTimeBuy1Info锛歿code}-{buy1_info}")
# L1DataProcessor.excute_sell_rule(code, buy1_info[3], buy1_info[1], "l2-real")
@@ -245,7 +244,8 @@
# 鍔犺浇寮�鐩樺暒鏉垮潡鏃ュ織鏁版嵁
- kpl_data_manager.KPLStockOfMarketsPlateLogManager()
+ kpl_data_manager.KPLMarketsSiftPlateLogManager()
+ kpl_data_manager.KPLMarketStockHeatLogManager()
# 鍚姩寮傛鏃ュ織
threading.Thread(target=async_log_util.run_sync, daemon=True).start()
--
Gitblit v1.8.0