From aacc6148dd43a9cffbff9a23a273a55b64bf3d8c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期六, 12 十月 2024 17:21:42 +0800
Subject: [PATCH] bug修复
---
third_data/code_plate_key_manager.py | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 83eb4c5..884d33d 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -14,6 +14,8 @@
from settings.trade_setting import MarketSituationManager
from third_data.kpl_data_constant import LimitUpDataConstant
from third_data.third_blocks_manager import BlockMapManager, CodeThirdBlocksManager
+from trade.buy_money_count_setting import RadicalBuyBlockCodeCountManager
+from trade.order_statistic import DealAndDelegateWithBuyModeDataManager
from trade.radical_buy_data_manager import RedicalBuyDataManager
from utils import global_util, tool, buy_condition_util
from log_module import log, async_log_util
@@ -1127,7 +1129,7 @@
kpl_data_constant.open_limit_up_code_dict_for_radical_buy = temp_dict
@classmethod
- def __get_current_index(cls, code, block, yesterday_limit_up_codes, exclude_codes=None):
+ def __get_current_index(cls, code, block, yesterday_limit_up_codes, exclude_codes=None, limit_up_time=None):
"""
鑾峰彇褰撳墠娑ㄥ仠韬綅
@param code:
@@ -1140,7 +1142,8 @@
current_index = 0
block_codes_infos = []
timestamp_start, timestamp_end = kpl_block_util.open_limit_up_time_range
- limit_up_time = time.time()
+ if limit_up_time is None:
+ limit_up_time = time.time()
for k in LimitUpDataConstant.current_limit_up_datas:
_code = k[0]
if _code in exclude_codes:
@@ -1249,9 +1252,7 @@
"""
# 9:45鐐逛箣鍓嶆定鍋滅殑鎵嶈兘涔板叆
# 鑾峰彇褰撳墠浠ｇ爜鐨勬定鍋滄椂闂�
- limit_up_timestamp = LimitUpDataConstant.get_first_limit_up_time(code)
- if not limit_up_timestamp:
- limit_up_timestamp = time.time()
+ limit_up_timestamp = cls.__get_limit_up_timestamp(code)
if int(tool.timestamp_format(limit_up_timestamp, "%H%M%S")) > 94500:
return False, "瓒呰繃鐢熸晥鏃堕棿"
# 鏍规嵁鏉垮潡鑱氬悎鏁版嵁
@@ -1269,7 +1270,8 @@
# ----鑾峰彇鍘嗗彶韬綅----
history_index, history_before_codes_info = cls.__get_history_index(code, block, yesterday_limit_up_codes)
# ----鑾峰彇瀹炴椂韬綅----
- current_index, current_before_codes_info = cls.__get_current_index(code, block, yesterday_limit_up_codes)
+ current_index, current_before_codes_info = cls.__get_current_index(code, block, yesterday_limit_up_codes,
+ limit_up_time=limit_up_timestamp)
exclude_codes = set()
if count >= 2 or (
count == 1 and kpl_data_constant.open_limit_up_code_dict_for_radical_buy[open_limit_up_block_codes[0]][
@@ -1281,7 +1283,8 @@
# ----鑾峰彇鍘嗗彶韬綅----
history_index, history_before_codes_info = cls.__get_history_index(code, block, set())
# ----鑾峰彇瀹炴椂韬綅----
- current_index, current_before_codes_info = cls.__get_current_index(code, block, set())
+ current_index, current_before_codes_info = cls.__get_current_index(code, block, set(),
+ limit_up_time=limit_up_timestamp)
if history_before_codes_info and current_before_codes_info and history_before_codes_info[0][0] == \
current_before_codes_info[0][0]:
# 鍓嶆帓绗竴涓厓绱犳棤鐐告澘
@@ -1299,7 +1302,8 @@
return False, f"寮�1鏁伴噺锛歿count}锛岄潪寮�1棣栨澘韬綅涓嶅尮閰嶏細鍘嗗彶-{history_index + 1} 瀹炴椂-{current_index + 1}"
if history_index == 1:
# 褰撳墠浠ｇ爜涓鸿��2锛岃鍒ゆ柇鑰佸ぇ鏄惁鍙拱
- if RedicalBuyDataManager.can_buy(history_before_codes_info[0][0])[0]:
+ if RedicalBuyDataManager.can_buy(history_before_codes_info[0][0],
+ DealAndDelegateWithBuyModeDataManager().get_deal_codes())[0]:
return False, f"寮�1鏁伴噺锛歿count}锛屽墠鎺掍唬鐮佸彲涔帮細{history_before_codes_info[0]}"
return True, f"寮�1鏁伴噺锛歿count}锛屽墠鎺掍唬鐮佷笉鍙拱锛歿history_before_codes_info[0]}"
return True, f"寮�1鏁伴噺锛歿count}锛屽巻鍙�-{history_index + 1} 瀹炴椂-{current_index + 1}"
@@ -1319,17 +1323,17 @@
@param yesterday_limit_up_codes:
@return:
"""
+
+ # 鑾峰彇褰撳墠浠ｇ爜鐨勬定鍋滄椂闂�
+ limit_up_timestamp = cls.__get_limit_up_timestamp(code)
+
# 鑾峰彇褰撳墠鐨勬澘鍧�
- current_index, current_before_codes_info = cls.__get_current_index(code, block, set())
+ current_index, current_before_codes_info = cls.__get_current_index(code, block, set(),
+ limit_up_time=limit_up_timestamp)
current_before_codes = [x[0] for x in current_before_codes_info]
if len(current_before_codes_info) < 2:
return False, f"鍓嶆帓浠ｇ爜灏忎簬2涓細{current_before_codes_info}"
-
- # 鑾峰彇褰撳墠浠ｇ爜鐨勬定鍋滄椂闂�
- limit_up_timestamp = LimitUpDataConstant.get_first_limit_up_time(code)
- if not limit_up_timestamp:
- limit_up_timestamp = time.time()
# 褰撳墠浠ｇ爜寮�1涓嶈兘涔�
if limit_up_timestamp < kpl_block_util.open_limit_up_time_range[1]:
@@ -1348,7 +1352,7 @@
# 涓嶈绠楀墠2鐨勪唬鐮�
exclude_codes = set()
- for x in current_before_codes:
+ for x in current_before_codes_info:
if x[1] < kpl_block_util.open_limit_up_time_range[1]:
exclude_codes.add(x[0])
# 闄ゅ幓鍓嶄簩浠ｇ爜涓庡紑1浠ｇ爜涔嬪悗鏄惁涓洪鏉胯�佸ぇ锛氭墍鏈夊紑1鐨勮涓�1涓�
@@ -1364,20 +1368,28 @@
exclude_codes |= set(open_limit_up_code_dict.keys())
history_index, history_before_codes_info = cls.__get_history_index(code, block, yesterday_limit_up_codes,
exclude_codes)
- if history_index > 1:
- return False, f"鎺掗櫎鍓�2锛岀洰鏍囦唬鐮佷綅浜庡巻鍙茶韩浣�-{history_index + 1}锛屽墠鎺掍唬鐮侊細{history_before_codes_info}"
- elif history_index == 1:
- # 棣栨澘鑰�2锛屽垽鏂墠闈㈢殑鑰佸ぇ鏄惁鏄睘浜庝笉鑳戒拱鐨勮寖鐣�
- pre_code = history_before_codes_info[0][0]
- # pre_code涓嶈兘涔帮紝鎵嶈兘涔�
- if RedicalBuyDataManager.can_buy(pre_code)[0]:
- return False, f"鍓嶆帓浠ｇ爜鍙拱锛歿pre_code}"
- # 璺濈鍓嶄竴涓槸鍚﹀湪10鍒嗛挓鍐�
- if tool.trade_time_sub(tool.timestamp_format(limit_up_timestamp, '%H:%M:%S'),
- tool.timestamp_format(history_before_codes_info[-1][1], '%H:%M:%S')) >= 10 * 60:
- return False, f"璺濈涓婁釜涓嶈兘涔扮殑浠ｇ爜娑ㄥ仠宸茶繃鍘�10鍒嗛挓锛坽history_before_codes_info[0]}锛�"
+ # 鑾峰彇鏈澘鍧椾拱鍏ヤ唬鐮佺殑鏈�澶ф暟閲�
+ max_count = RadicalBuyBlockCodeCountManager().get_block_code_count(block)
+ if history_index > max_count:
+ return False, f"鎺掗櫎鍓�2锛岀洰鏍囦唬鐮佷綅浜庡巻鍙茶韩浣�-{history_index + 1}锛屽墠鎺掍唬鐮侊細{history_before_codes_info}, 鏉垮潡鏈�澶氬彲涔皗max_count}"
+
+ if max_count == 1:
+ if history_index == 1:
+ # 棣栨澘鑰�2锛屽垽鏂墠闈㈢殑鑰佸ぇ鏄惁鏄睘浜庝笉鑳戒拱鐨勮寖鐣�
+ pre_code = history_before_codes_info[0][0]
+ # pre_code涓嶈兘涔帮紝鎵嶈兘涔�
+ if RedicalBuyDataManager.can_buy(pre_code, DealAndDelegateWithBuyModeDataManager().get_deal_codes())[0]:
+ return False, f"鍓嶆帓浠ｇ爜鍙拱锛歿pre_code}"
+ # 璺濈鍓嶄竴涓槸鍚﹀湪10鍒嗛挓鍐�
+ if tool.trade_time_sub(tool.timestamp_format(limit_up_timestamp, '%H:%M:%S'),
+ tool.timestamp_format(history_before_codes_info[-1][1], '%H:%M:%S')) >= 10 * 60:
+ return False, f"璺濈涓婁釜涓嶈兘涔扮殑浠ｇ爜娑ㄥ仠宸茶繃鍘�10鍒嗛挓锛坽history_before_codes_info[0]}锛�"
+ else:
+ # 璺濈涓婁釜浠ｇ爜娑ㄥ仠5鍒嗛挓浠ュ唴
+ if tool.trade_time_sub(tool.timestamp_format(limit_up_timestamp, '%H:%M:%S'),
+ tool.timestamp_format(current_before_codes_info[-1][1], '%H:%M:%S')) >= 5 * 60:
+ return False, f"璺濈涓婁釜浠ｇ爜娑ㄥ仠宸茶繃鍘�5鍒嗛挓锛坽current_before_codes_info[-1]}锛�"
else:
- # 璺濈涓婁釜浠ｇ爜娑ㄥ仠5鍒嗛挓浠ュ唴
if tool.trade_time_sub(tool.timestamp_format(limit_up_timestamp, '%H:%M:%S'),
tool.timestamp_format(current_before_codes_info[-1][1], '%H:%M:%S')) >= 5 * 60:
return False, f"璺濈涓婁釜浠ｇ爜娑ㄥ仠宸茶繃鍘�5鍒嗛挓锛坽current_before_codes_info[-1]}锛�"
@@ -1386,8 +1398,16 @@
@classmethod
def __is_re_limit_up(cls, code, block):
+ """
+ 鏄惁鏄偢鏉垮洖灏佸彲涔�
+ @param code:
+ @param block:
+ @return:
+ """
# 鑾峰彇韬綅
- current_index, current_before_codes_info = cls.__get_current_index(code, block, set())
+ current_index, current_before_codes_info = cls.__get_current_index(code, block, set(),
+ limit_up_time=cls.__get_limit_up_timestamp(
+ code))
history_index, history_before_codes_info = cls.__get_history_index(code, block, set())
if current_index != history_index:
return False, f"鏈夊叾浠栫偢鏉�"
@@ -1420,6 +1440,18 @@
if diff:
return False, f"鏉垮潡鐐告澘涓嶆褰撳墠绁細{diff}"
return True, ""
+
+ @classmethod
+ def __get_limit_up_timestamp(cls, code):
+ """
+ 鑾峰彇浠ｇ爜鐨勬定鍋滄椂闂达紝榛樿褰撳墠鏃堕棿
+ @param code:
+ @return:
+ """
+ limit_up_timestamp = LimitUpDataConstant.get_first_limit_up_time(code)
+ if not limit_up_timestamp:
+ limit_up_timestamp = time.time()
+ return limit_up_timestamp
@classmethod
def get_code_kpl_blocks(cls, code):
@@ -1489,15 +1521,18 @@
result = cls.__is_radical_buy_with_block_up(code, b, yesterday_limit_up_codes)
if result[0]:
can_buy_blocks.add(b)
+
msges.append(f"銆恵b}銆�:{result[1]}")
fmsges.append("鏉垮潡蹇�熷惎鍔ㄥ垽鏂�##" + ",".join(msges))
if not can_buy_blocks:
+ msges.clear()
for b in keys_:
result = cls.__is_re_limit_up(code, b)
if result[0]:
can_buy_blocks.add(b)
-
+ msges.append(f"銆恵b}銆�:{result[1]}")
+ fmsges.append("鏉垮潡鍥炲皝鍒ゆ柇##" + ",".join(msges))
return can_buy_blocks, " **** ".join(fmsges)
--
Gitblit v1.8.0