From 3a1e8b07f6f7f217248b41a1ddcd23d955d4ff01 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 15 四月 2025 17:52:15 +0800
Subject: [PATCH] 新题材日志修改
---
api/outside_api_command_callback.py | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 48f7d20..d14a2b9 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -14,7 +14,7 @@
import constant
import inited_data
import outside_api_command_manager
-from cancel_strategy.s_l_h_cancel_strategy import SCancelBigNumComputer
+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.code_data_util import ZYLTGBUtil
from code_attribute.code_l1_data_manager import L1DataManager
@@ -46,7 +46,7 @@
from third_data.kpl_limit_up_data_manager import CodeLimitUpSequenceManager
from third_data.kpl_util import KPLDataType
from third_data.third_blocks_manager import CodeThirdBlocksManager, SOURCE_TYPE_KPL, BlockMapManager
-from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant
+from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant, trade_record_log_util
import l2_data_util as l2_data_util_old
from trade.buy_money_count_setting import BuyMoneyAndCountSetting, RadicalBuyBlockCodeCountManager
from trade.buy_radical import block_special_codes_manager, radical_buy_data_manager
@@ -292,6 +292,7 @@
fresult = {"code": 0}
if code_list_type == outside_api_command_manager.CODE_LIST_WANT:
if operate == outside_api_command_manager.OPERRATE_SET:
+ trade_record_log_util.add_want_buy(code)
gpcode_manager.WantBuyCodesManager().add_code(code)
if l2_trade_util.is_in_forbidden_trade_codes(code):
l2_trade_util.remove_from_forbidden_trade_codes(code)
@@ -303,6 +304,7 @@
if results:
gpcode_manager.CodesNameManager.add_first_code_name(code, results[code])
elif operate == outside_api_command_manager.OPERRATE_DELETE:
+ trade_record_log_util.remove_want_buy(code)
gpcode_manager.WantBuyCodesManager().remove_code(code)
elif operate == outside_api_command_manager.OPERRATE_GET:
codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
@@ -375,6 +377,7 @@
elif code_list_type == outside_api_command_manager.CODE_LIST_MUST_BUY:
if operate == outside_api_command_manager.OPERRATE_SET:
gpcode_manager.MustBuyCodesManager().add_code(code)
+ trade_record_log_util.add_must_buy(code, "鎵嬪姩鎷夌孩")
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -549,10 +552,8 @@
latest_trading_date = history_k_data_util.get_k_bar_dead_date()
codes = HistoryKDataManager().get_history_bars_codes(latest_trading_date)
count = len(codes)
- logger_debug.info(f"K绾夸唬鐮佹暟閲忥細{count}")
fdata["today_history_k_bar_count"] = count
except Exception as e:
- logger_debug.exception(e)
fdata["today_history_k_bar_count"] = -1
# 鑾峰彇鏁版嵁鏈嶅姟鍣ㄦ槸鍚﹁仈閫�
@@ -1061,6 +1062,23 @@
break
except:
pass
+ # L鎾ゆ瘮渚�
+ l_down_cancel_rate, must_buy = LCancelRateManager.get_cancel_rate(code,
+ buy_mode=OrderBeginPosInfo.MODE_RADICAL)
+
+ # 鍦ㄦ寕鐨勮窛绂绘垚浜よ繘搴︿綅閲戦/锛堣繙杩戞湡鍙傝�冮噺-鍗曞綋鏃ュ疄鏃舵垚浜ら噺锛�*100%
+ expire_rate = "鏈煡"
+ 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_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
+
fdata = {"id": orderSysID, "code_info": (code, code_name), "total_num": total_nums,
"finish_num": deal_or_cancel_num,
"buy1_money": output_util.money_desc(buy1_money),
@@ -1083,7 +1101,9 @@
"limit_up_price": gpcode_manager.get_limit_up_price_as_num(code),
"is_near_big_order": is_near_big_order,
"block": '',
- "trade_queue": []
+ "trade_queue": [],
+ "l_down_cancel_rate": l_down_cancel_rate,
+ "expire_rate": expire_rate
}
limit_up_data = kpl_data_manager.KPLLimitUpDataRecordManager.record_code_dict.get(code)
# 鑾峰彇褰撳墠鏉垮潡
@@ -1349,7 +1369,9 @@
"radical_buy": {"price": (constant.MIN_CODE_RADICAL_BUY_PRICE, constant.MAX_CODE_RADICAL_BUY_PRICE),
"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
+ "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,
+ "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,
@@ -1367,6 +1389,12 @@
if radical_buy.get("special_codes_max_block_in_rank"):
constant.RADICAL_BUY_TOP_IN_INDEX_WITH_SPECIAL = radical_buy.get(
"special_codes_max_block_in_rank")
+ 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,
--
Gitblit v1.8.0