From 950c4677c35738d9c77ac449f836e5785fc5bf69 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 30 九月 2024 16:51:33 +0800
Subject: [PATCH] 扫入板块调整
---
api/outside_api_command_callback.py | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index d5bd127..860d85e 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -35,7 +35,8 @@
logger_real_place_order_position, logger_device
from output import l2_output_util
from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
-from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, RealTimeKplMarketData
+from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, RealTimeKplMarketData, \
+ RadicalBuyBlockManager
from third_data.history_k_data_manager import HistoryKDataManager
from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
from third_data.kpl_data_manager import KPLDataManager
@@ -1234,16 +1235,14 @@
kpl_blocks = set()
if not kpl_blocks:
KPLCodeJXBlockManager().load_jx_blocks_radical(code)
- match_blocks, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, kpl_blocks)
- if match_blocks:
- match_blocks = set(match_blocks)
- match_blocks &= RealTimeKplMarketData.get_top_market_jingxuan_blocks()
+
+ filter_blocks, match_blocks = RadicalBuyBlockManager.get_code_blocks(code)
source_origin_dict[SOURCE_TYPE_KPL] = kpl_blocks
source_dict[SOURCE_TYPE_KPL] = BlockMapManager().filter_blocks(kpl_blocks)
data = {
"blocks": {},
"origin_blocks": {},
- "match_blocks": list(match_blocks)
+ "match_blocks": [list(filter_blocks), list(match_blocks)]
}
for s in source_origin_dict:
data["origin_blocks"][s] = list(source_origin_dict[s])
--
Gitblit v1.8.0