From f34371f754a4099355dfa0f2a6b6bcca81ec2817 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 30 四月 2024 17:29:25 +0800
Subject: [PATCH] 激进买入策略修改
---
third_data/code_plate_key_manager.py | 140 +++++++++++++++-------------------------------
1 files changed, 47 insertions(+), 93 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 69b9d9b..36a7fd8 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -513,74 +513,30 @@
# 鏄惁闇�瑕佹縺杩涗拱
@classmethod
- def __is_need_active_buy(cls, code, block, current_limit_up_datas, limit_up_record_datas,
- yesterday_current_limit_up_codes):
+ def __is_need_active_buy(cls, code, block, current_rank, open_limit_up_count):
"""
- 婵�杩涗拱鍏ヨ鍒欙細涓绘澘鑰佸ぇ涓斿墠闈㈡湁楂樹綅鏉�/20cm
- @param code:
- @param block:
- @param current_limit_up_datas:
- @param limit_up_record_datas:
- @param yesterday_current_limit_up_codes:
+ 鏉垮潡鏄惁闇�瑕佹縺杩涗拱鍏�
+ 瑙勫垯锛氭牴鎹韩浣嶅垽鏂槸鍚﹂渶瑕佹縺杩涗拱锛屾牴鎹椂闂村垝鍒�
+ @param code: 浠ｇ爜
+ @param block: 鏉垮潡鍚嶇О
+ @param current_rank: 鐩墠鍦ㄦ澘鍧椾腑鐨勮韩浣嶏紝浠�0寮�濮�
+ @param open_limit_up_count: 寮�1鐨勬暟閲�
@return:
"""
- code_limit_up_reason_dict = {}
- for d in limit_up_record_datas:
- code_limit_up_reason_dict[d[3]] = d[2]
- # 鍓嶉潰鏈夐珮浣嶆澘/闈炰富鏉挎定鍋滀笖鏇炬定鍋滀富鏉挎帓鑰佸ぇ鍒欐縺杩涗拱
- block_codes_info = []
- contains_code = False
- for d in current_limit_up_datas:
- reason = kpl_util.get_current_limit_up_reason(d)
- if reason != block:
- continue
- if d[0] == code:
- contains_code = True
- # 鏍煎紡锛歔浠ｇ爜,娑ㄥ仠鏃堕棿,鏄惁楂樹綅鏉�, 鑷敱娴侀�氬競鍊糫
- block_codes_info.append((d[0], d[2], d[0] in yesterday_current_limit_up_codes, d[7]))
- if not contains_code:
- block_codes_info.append((code, int(time.time()), False, global_util.zyltgb_map.get(code)))
- block_codes_info.sort(key=lambda x: x[1])
- # 鏆傚瓨鍦ㄥ綋鍓嶄唬鐮佷箣鍓嶆定鍋滅殑楂樹綅鏉�/闈炰富鏉夸唬鐮�
- before_codes = []
- for info in block_codes_info:
- if info[0] == code:
+ real_current_rank = max(current_rank - open_limit_up_count, 0)
+
+ TIME_STR_RANGES = ["10:00:00", "10:30:00", "11:00:00", "13:00:00", "13:30:00", "14:00:00", "14:30:00",
+ "15:00:00"]
+ TIME_INT_RANGES = [int(x.replace(':', '')) for x in TIME_STR_RANGES]
+ MAX_RANKS = [3, 3, 2, 2, 1, 0, 0, 0]
+ now_time_str = tool.get_now_time_str().replace(':', '')
+ for i in range(len(TIME_INT_RANGES)):
+ if int(now_time_str) <= TIME_INT_RANGES[i]:
+ if MAX_RANKS[i] > real_current_rank:
+ return True
break
- if info[2] or not tool.is_shsz_code(info[0]):
- before_codes.append(info[0])
- if before_codes:
- # 鍒ゆ柇鍘嗗彶娑ㄥ仠涓绘澘韬綅
- record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
- limit_up_record_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes,
- shsz=True)
- if record_shsz_rank == 0:
- # 鍘嗗彶涓绘澘鑰佸ぇ
- return True, f"涓绘澘鑰佸ぇ涓斿墠闈㈡湁闈炰富鏉�/楂樹綅鏉挎定鍋滐紝鍏堜簬娑ㄥ仠浠ｇ爜锛歿before_codes}"
- # 鎺掗櫎鑷繁鏈�3涓定鍋滐紝涓旇繖4涓腑鑷敱娴侀�氬競鍊兼渶灏忥紝涓旀定鍋滆繃鐨勪唬鐮佷腑涓绘澘鎺掑悕鍓�4
- if len(block_codes_info) >= 4:
- temp_codes = []
- for info in block_codes_info:
- # 涓嶆槸楂樹綅鏉夸笖鏄富鏉�
- if not info[2] and tool.is_shsz_code(info[0]):
- # 鏍煎紡锛�(浠ｇ爜, 鑷敱娴侀�氬競鍊�)
- temp_codes.append((info[0], info[3]))
- # 鍒ゆ柇鏄惁涓轰富鏉夸腑鑷敱甯傚�兼渶灏�
- temp_codes.sort(key=lambda x: x[1])
- if temp_codes[0][0] == code:
- # 鑷敱甯傚�兼渶灏�
- # 鍒ゆ柇鍘嗗彶韬綅
- record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
- limit_up_record_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes,
- shsz=True)
- if record_shsz_rank < 4:
- return True, f"鏉垮潡鏈夊ぇ浜�3绁ㄦ定鍋滐紝涓旇嚜鐢辨祦閫氬競鍊兼渶灏忥紝韬綅({record_shsz_rank})鍓�4"
-
- return False, "涓嶆弧瓒虫縺杩涗拱鍏ユ潯浠�"
+ return False
# 杩斿洖鍐呭(鏄惁鍙拱, 鏄惁涓虹嫭鑻�, 鎻忚堪淇℃伅, 鏄惁涓哄己鍔夸富绾�, 鏄惁闇�瑕佹縺杩涗拱)
@classmethod
@@ -595,18 +551,14 @@
block_codes = current_limit_up_block_codes_dict.get(block)
if block_codes is None:
block_codes = set()
- # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
- active_buy = cls.__is_need_active_buy(code, block, current_limit_up_datas,
- limit_up_record_datas,
- yesterday_current_limit_up_codes)
if not block_codes:
# 楂樹綅鏉挎硾鍖栨澘鍧椾腑鏃犳澘鍧�
if not high_level_block_codes.get(block):
- return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, active_buy
+ return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, False
elif len(block_codes) == 1 and code in block_codes:
if not high_level_block_codes.get(block):
- return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, active_buy
+ return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, False
# 鍙互涔扮殑鏈�澶ф帓鍚�
# open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
# code_limit_up_reason_dict)
@@ -669,6 +621,9 @@
current_open_limit_up_codes),
shsz=True,
limit_up_time=first_limit_up_time)
+ # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
+ is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes))
+
# record_shsz_rank, record_shsz_rank_codes = kpl_block_util.get_code_record_rank(code, block,
# limit_up_record_datas,
# code_limit_up_reason_dict,
@@ -676,10 +631,10 @@
# shsz=True)
if int(tool.get_now_time_str().replace(":", "")) <= int("094000") and is_strong_block:
# 寮哄娍涓荤嚎鍔犲己鍔�10鍒嗛挓
- return True, False, f"銆恵block}銆戯細寮哄娍涓荤嚎+寮哄娍10鍒嗛挓", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戯細寮哄娍涓荤嚎+寮哄娍10鍒嗛挓", is_strong_block, is_active_buy
if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
- return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, is_active_buy
else:
# k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
# if k_format and k_format[8][0]:
@@ -692,8 +647,8 @@
situation = MarketSituationManager().get_situation_cache()
zylt_threshold_as_yi = buy_condition_util.get_zyltgb_threshold(situation)
if zyltgb_as_yi and zylt_threshold_as_yi[2] <= zyltgb_as_yi <= zylt_threshold_as_yi[3]:
- return True, False, f"銆恵block}銆戝己鍔挎澘鍧� 鑷敱娴侀�氬競鍊�({zyltgb_as_yi})澶т簬{zylt_threshold_as_yi[2]}浜� 灏忎簬{zylt_threshold_as_yi[3]}浜�", is_strong_block, active_buy
- return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戝己鍔挎澘鍧� 鑷敱娴侀�氬競鍊�({zyltgb_as_yi})澶т簬{zylt_threshold_as_yi[2]}浜� 灏忎簬{zylt_threshold_as_yi[3]}浜�", is_strong_block, is_active_buy
+ return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, is_active_buy
# 杩囨椂鐨勪唬鐮�
# if open_limit_up_codes:
@@ -740,18 +695,14 @@
block_codes = current_limit_up_block_codes_dict.get(block)
if block_codes is None:
block_codes = set()
- # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
- active_buy = cls.__is_need_active_buy(code, block, current_limit_up_datas,
- limit_up_record_datas,
- yesterday_current_limit_up_codes)
if not block_codes:
# 楂樹綅鏉挎硾鍖栨澘鍧椾腑鏃犳澘鍧�
if not high_level_block_codes.get(block):
- return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, active_buy
+ return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False, False
elif len(block_codes) == 1 and code in block_codes:
if not high_level_block_codes.get(block):
- return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, active_buy
+ return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False, False
# 鍙互涔扮殑鏈�澶ф帓鍚�
# open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
# code_limit_up_reason_dict)
@@ -796,10 +747,14 @@
current_open_limit_up_codes),
shsz=True,
limit_up_time=first_limit_up_time)
+
+ # 璁＄畻鏄惁闇�瑕佹縺杩涗拱鍏�
+ is_active_buy = cls.__is_need_active_buy(code, block, current_shsz_rank, len(current_open_limit_up_codes))
+
if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
- return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, active_buy
+ return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block, is_active_buy
else:
- return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, active_buy
+ return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block, is_active_buy
# 鑾峰彇鍙互涔扮殑鏉垮潡
# current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠
@@ -842,15 +797,15 @@
code_limit_up_reasons_dict = {}
load_code_block()
for block in keys:
- can_buy, unique, msg, is_strong, active_buy_info = cls.__is_block_can_buy_new(code, block,
- current_limit_up_datas,
- code_limit_up_reasons_dict,
- yesterday_current_limit_up_codes,
- limit_up_record_datas,
- current_limit_up_block_codes_dict,
- high_level_code_blocks=high_level_general_code_blocks,
- high_level_block_codes=high_level_general_block_codes)
- fresults.append((block, can_buy, unique, msg, is_strong, active_buy_info))
+ can_buy, unique, msg, is_strong, is_active_buy = cls.__is_block_can_buy_new(code, block,
+ current_limit_up_datas,
+ code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes,
+ limit_up_record_datas,
+ current_limit_up_block_codes_dict,
+ high_level_code_blocks=high_level_general_code_blocks,
+ high_level_block_codes=high_level_general_block_codes)
+ fresults.append((block, can_buy, unique, msg, is_strong, is_active_buy))
return fresults, keys
# 鏄惁鍙互涓嬪崟
@@ -947,10 +902,9 @@
can_buy_strong_blocks.append(r[0])
if r[3]:
msg_list.append(r[3])
- if r[5][0]:
+ if r[5]:
active_buy_blocks.append(r[0])
- msg_list.append(f"銆恵r[0]}銆戞縺杩涗拱鍏�({r[5][1]})")
-
+ msg_list.append(f"銆恵r[0]}銆戞縺杩涗拱鍏�({r[5]})")
else:
if r[3]:
msg_list.append(r[3])
--
Gitblit v1.8.0