From 257bb8ce781ec0ef582092ea8e453ae9aec2a2c4 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期三, 23 四月 2025 17:48:45 +0800 Subject: [PATCH] 多余日志删除 --- api/outside_api_command_callback.py | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py index 9c233dd..b97f5ea 100644 --- a/api/outside_api_command_callback.py +++ b/api/outside_api_command_callback.py @@ -15,7 +15,7 @@ import inited_data import outside_api_command_manager from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer, LCancelRateManager -from code_attribute import gpcode_manager, code_volumn_manager, zyltgb_util +from code_attribute import gpcode_manager, code_volumn_manager, zyltgb_util, code_nature_analyse from code_attribute.code_data_util import ZYLTGBUtil from code_attribute.code_l1_data_manager import L1DataManager from code_attribute.gpcode_manager import CodePrePriceManager, CodesNameManager, WantBuyCodesManager, \ @@ -60,7 +60,7 @@ from trade.trade_data_manager import RadicalBuyDealCodesManager from trade.trade_manager import TradeTargetCodeModeManager, AutoCancelSellModeManager from settings.trade_setting import MarketSituationManager, TradeBlockBuyModeManager -from utils import socket_util, data_export_util, tool, huaxin_util, output_util, global_util +from utils import socket_util, data_export_util, tool, huaxin_util, output_util, global_util, init_data_util from servers import server_util @@ -1071,8 +1071,11 @@ try: referer_volume = code_volumn_manager.CodeVolumeManager().get_radical_buy_refer_volume( code, limit_up_price) - today_volumn = code_volumn_manager.CodeVolumeManager().get_today_volumn(code) - expire_rate = f"{round(100 * total_left_num * 100 / (referer_volume - today_volumn), 2)}%" + today_volumn = code_volumn_manager.CodeVolumeManager().get_today_volumn_cache(code) + if referer_volume == today_volumn: + expire_rate = "100%" + else: + expire_rate = f"{100 - round(100 * total_left_num * 100 / (referer_volume - today_volumn), 2)}%" except: pass @@ -1302,12 +1305,28 @@ 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) + + dates = HistoryKDatasUtils.get_latest_trading_date_cache(5) + latest_trading_date = None + is_new_top = False + if dates: + latest_trading_date = dates[0] + if latest_trading_date: + volumes_data = HistoryKDataManager().get_history_bars(code, latest_trading_date) + if volumes_data: + is_new_top = code_nature_analyse.is_new_top(code, + gpcode_manager.get_limit_up_price_by_preprice(code, + volumes_data[0]["close"]), + volumes_data) + data = { "blocks": {}, "origin_blocks": {}, "match_blocks": [list(filter_blocks), list(match_blocks)], # 鏉垮潡鍑�娴佸叆鎯呭喌 - "block_in_moneys": [RealTimeKplMarketData.get_block_info_at_block_in(b) for b in filter_blocks] + "block_in_moneys": [RealTimeKplMarketData.get_block_info_at_block_in(b) for b in filter_blocks], + # 鏄惁鏄獊鐮存澘 + "is_new_top": is_new_top } for s in source_origin_dict: data["origin_blocks"][s] = list(source_origin_dict[s]) @@ -1367,7 +1386,8 @@ "zyltgb": constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES, "top_block_count_by_market_strong": constant.RADICAL_BUY_TOP_IN_COUNT_BY_MARKET_STRONG, "special_codes_max_block_in_rank": constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL, - "ignore_block_in_money_market_strong": constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG + "ignore_block_in_money_market_strong": constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG, + "buy_first_limit_up": 1 if constant.CAN_BUY_FIRST_LIMIT_UP else 0 }} self.send_response({"code": 0, "data": data, "msg": f""}, client_id, @@ -1388,6 +1408,10 @@ if radical_buy.get('ignore_block_in_money_market_strong') is not None: constant.IGNORE_BLOCK_IN_MONEY_MARKET_STRONG = radical_buy.get( 'ignore_block_in_money_market_strong') + if radical_buy.get('buy_first_limit_up') is not None: + constant.CAN_BUY_FIRST_LIMIT_UP = True if radical_buy.get( + 'buy_first_limit_up') else False + self.send_response({"code": 0, "data": {}, "msg": f""}, client_id, request_id) -- Gitblit v1.8.0