From 81fc9f181b9c114c3bcbb470538e3578c3a8144b Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 30 九月 2024 14:11:49 +0800 Subject: [PATCH] 接口修改 --- api/outside_api_command_callback.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py index 504ddc3..d5bd127 100644 --- a/api/outside_api_command_callback.py +++ b/api/outside_api_command_callback.py @@ -34,8 +34,8 @@ logger_trade, logger_trade_position_api_request, logger_request_api, \ logger_real_place_order_position, logger_device from output import l2_output_util -from third_data import kpl_data_manager, kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager -from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager +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.history_k_data_manager import HistoryKDataManager from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils from third_data.kpl_data_manager import KPLDataManager @@ -1224,13 +1224,20 @@ # 鑾峰彇绗笁鏂规澘鍧楁暟鎹� code = data["code"] source_dict = copy.deepcopy(CodeThirdBlocksManager().get_source_blocks(code)) + if not source_dict: + source_dict = {} source_origin_dict = copy.deepcopy(CodeThirdBlocksManager().get_source_blocks_origin(code)) + if not source_origin_dict: + source_origin_dict = {} kpl_blocks = KPLCodeJXBlockManager().get_jx_blocks_radical(code) if kpl_blocks is None: 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() source_origin_dict[SOURCE_TYPE_KPL] = kpl_blocks source_dict[SOURCE_TYPE_KPL] = BlockMapManager().filter_blocks(kpl_blocks) data = { -- Gitblit v1.8.0