From a53ab43591e80223e736261a3cd6fbebb7ae4e55 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期三, 06 十一月 2024 16:12:35 +0800 Subject: [PATCH] 扫入板块修改/不保存非交易时间的开盘啦涨停队列 --- third_data/code_plate_key_manager.py | 49 +++++++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py index 9039f21..a7e5c25 100644 --- a/third_data/code_plate_key_manager.py +++ b/third_data/code_plate_key_manager.py @@ -12,7 +12,7 @@ from db.redis_manager_delegate import RedisUtils from third_data import kpl_block_util, kpl_api, kpl_util, kpl_data_constant, huaxin_l1_data_manager from settings.trade_setting import MarketSituationManager -from third_data.kpl_data_constant import LimitUpDataConstant +from third_data.kpl_data_constant import LimitUpDataConstant, LimitUpCodesBlockRecordManager from third_data.third_blocks_manager import BlockMapManager, CodeThirdBlocksManager from trade.buy_money_count_setting import RadicalBuyBlockCodeCountManager from trade.order_statistic import DealAndDelegateWithBuyModeDataManager @@ -1531,25 +1531,34 @@ @param code: @return: 杩囨护鍚庣殑鏉垮潡,杩囨护鍓嶇殑鏉垮潡 """ - blocks = cls.get_code_kpl_blocks(code) - match_blocks, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, blocks) - match_blocks -= constant.KPL_INVALID_BLOCKS - fblocks = match_blocks & RealTimeKplMarketData.get_top_market_jingxuan_blocks() - if not fblocks: - fblocks = set() - match_blocks_3, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, blocks, same_count=3) - if match_blocks_3: - match_blocks_3 -= constant.KPL_INVALID_BLOCKS - fblocks |= match_blocks_3 - # 鑾峰彇寮�鐩樺暒鍘嗗彶娑ㄥ仠鍘熷洜 - kpl_history_blocks = CodesHisReasonAndBlocksManager().get_history_blocks_cache(code) - if kpl_history_blocks: - fblocks |= BlockMapManager().filter_blocks(kpl_history_blocks) - jx_out_blocks = RealTimeKplMarketData.get_top_market_jingxuan_out_blocks() - if jx_out_blocks: - fblocks -= jx_out_blocks + # blocks = cls.get_code_kpl_blocks(code) + # match_blocks, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, blocks) + # match_blocks -= constant.KPL_INVALID_BLOCKS + # fblocks = match_blocks & RealTimeKplMarketData.get_top_market_jingxuan_blocks() + # if not fblocks: + # fblocks = set() + # match_blocks_3, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, blocks, same_count=3) + # if match_blocks_3: + # match_blocks_3 -= constant.KPL_INVALID_BLOCKS + # fblocks |= match_blocks_3 + # # 鑾峰彇寮�鐩樺暒鍘嗗彶娑ㄥ仠鍘熷洜 + # kpl_history_blocks = CodesHisReasonAndBlocksManager().get_history_blocks_cache(code) + # if kpl_history_blocks: + # fblocks |= BlockMapManager().filter_blocks(kpl_history_blocks) + # jx_out_blocks = RealTimeKplMarketData.get_top_market_jingxuan_out_blocks() + # if jx_out_blocks: + # fblocks -= jx_out_blocks + # + # return fblocks, match_blocks - return fblocks, match_blocks + # 鏂扮増鏈� + before_fblocks = LimitUpCodesBlockRecordManager().get_radical_buy_blocks(code) + if before_fblocks: + before_fblocks = set() + fblocks = BlockMapManager().filter_blocks(before_fblocks) + if fblocks: + fblocks -= constant.KPL_INVALID_BLOCKS + return fblocks, before_fblocks @classmethod def is_radical_buy(cls, code, yesterday_limit_up_codes): @@ -1601,7 +1610,7 @@ msges.append(f"銆恵b}銆�:{result[1]}") fmsges.append("鏉垮潡鍥炲皝鍒ゆ柇##" + ",".join(msges)) - # 濡傛灉鑳芥壂鍏ュ氨闇�瑕佽幏鍙栦唬鐮佸湪鏉垮潡涓殑韬綅锛屾瑙勫垯鏆傛椂涓嶇敓鏁� + # 濡傛灉鑳芥壂鍏ュ氨闇�瑕佽幏鍙栦唬鐮佸湪鏉垮潡涓殑韬綅 # if can_buy_blocks: # excude_codes = set() # if kpl_data_constant.open_limit_up_code_dict_for_radical_buy: -- Gitblit v1.8.0