From 950c4677c35738d9c77ac449f836e5785fc5bf69 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 九月 2024 16:51:33 +0800
Subject: [PATCH] 扫入板块调整

---
 third_data/code_plate_key_manager.py |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 036c9cf..9cb304e 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -1422,6 +1422,25 @@
         return True, ""
 
     @classmethod
+    def get_code_blocks(cls, code):
+        """
+        鑾峰彇鐩爣浠g爜鐨勬澘鍧�
+        @param code:
+        @return: 杩囨护鍚庣殑鏉垮潡,杩囨护鍓嶇殑鏉垮潡
+        """
+        blocks = KPLCodeJXBlockManager().get_jx_blocks_radical(code)
+        if blocks is None:
+            blocks = set()
+        # 灏嗚幏鍙栨定鍋滃師鍥犱笌娑ㄥ仠鎺ㄨ崘
+        keys = TargetCodePlateKeyManager().get_plate_keys(code, contains_today=False)
+        if keys and keys[0]:
+            blocks |= set(keys[0])
+        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()
+        return fblocks, match_blocks
+
+    @classmethod
     def is_radical_buy(cls, code, yesterday_limit_up_codes):
         """
         鏄惁鏄縺杩涗拱
@@ -1436,15 +1455,7 @@
             for c in open_limit_up_code_dict:
                 open_limit_up_blocks |= open_limit_up_code_dict[c][1]
         # 鑾峰彇浠g爜鐨勬澘鍧�
-        keys_ = KPLCodeJXBlockManager().get_jx_blocks_radical(code)
-        keys_ &= RealTimeKplMarketData.get_top_market_jingxuan_blocks()
-        if not keys_:
-            return set(), "娌¤幏鍙栧埌鏉垮潡"
-        keys_ = BlockMapManager().filter_blocks(keys_)
-        if not keys_:
-            return set(), "杩囨护鍚庢病鑾峰彇鍒版澘鍧�"
-        # 鑾峰彇浜ら泦
-        keys_, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, keys_)
+        keys_, info = cls.get_code_blocks(code)
         if not keys_:
             return set(), "娌¤幏鍙栧埌鏉垮潡浜ら泦"
 

--
Gitblit v1.8.0