From 3da5d1ef00cf7665c2d37f837e6845c92d22e31c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 15 十二月 2023 16:02:08 +0800
Subject: [PATCH] 前日炸板策略修改
---
third_data/code_plate_key_manager.py | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 7caaf9f..02d72e3 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -43,11 +43,8 @@
final_blocks = copy.deepcopy(blocks)
if len(blocks) > 2:
final_blocks.clear()
- # 鏍规嵁娑ㄥ箙鎺掑簭
- blocks.sort(key=lambda x: x[2])
- blocks.reverse()
for b in blocks:
- if b[1] not in constant.KPL_INVALID_BLOCKS:
+ if b not in constant.KPL_INVALID_BLOCKS:
final_blocks.append(b)
if len(final_blocks) < 2:
final_blocks = blocks
@@ -100,7 +97,7 @@
if price_rate > 0.07:
jx_blocks_info = self.get_jx_blocks_cache(code)
if not jx_blocks_info:
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�-{blocks}")
else:
@@ -118,14 +115,14 @@
if time.time() - jx_blocks_info[1] > UPDATE_TIME_SPACE:
# 璺濈涓婃鏇存柊鏃堕棿杩囧幓浜�5鍒嗛挓
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧楋紙鏇存柊锛�-{blocks}")
elif price_rate > 0.03:
# 娣诲姞澶囩敤鏉垮潡
if not self.get_jx_blocks_cache(code, by=True):
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks, by=True)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�(澶囩敤)-{blocks}")
except Exception as e:
@@ -450,7 +447,7 @@
jingxuan_block_info = self.__KPLCodeJXBlockManager.get_jx_blocks_cache(code, by=True)
if jingxuan_block_info:
jingxuan_blocks = jingxuan_block_info[0]
- k4 |= set([x[1] for x in jingxuan_blocks])
+ k4 |= set(jingxuan_blocks) # set([x[1] for x in jingxuan_blocks])
for k in [k1, k11, k2, k3, k4]:
keys |= k
@@ -528,6 +525,11 @@
is_strong_block = True
break
+ if not is_strong_block:
+ temp_block_codes = set(copy.deepcopy(block_codes))
+ temp_block_codes.discard(code)
+ if len(temp_block_codes) >= 3:
+ is_strong_block = True
max_rank = 2
# 寮哄娍鏉垮潡涔拌�佸洓
if is_strong_block:
@@ -542,6 +544,12 @@
if current_open_limit_up_codes and yesterday_current_limit_up_codes:
current_open_limit_up_codes -= yesterday_current_limit_up_codes
+ # 鑾峰彇浠ｇ爜鐨勫垵娆℃定鍋滄椂闂�
+ first_limit_up_time = time.time()
+ for r in limit_up_record_datas:
+ if r[3] == code:
+ first_limit_up_time = int(r[5])
+
# 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block,
current_limit_up_datas,
@@ -550,7 +558,8 @@
exclude_first_codes,
len(
current_open_limit_up_codes),
- shsz=True)
+ shsz=True,
+ limit_up_time=first_limit_up_time)
# 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,
@@ -563,6 +572,11 @@
if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block
else:
+ # 鐪嬭嚜鐢辨祦閫氬競鍊兼槸鍚﹀皬浜�20浜�
+ if is_strong_block:
+ zyltgb = global_util.zyltgb_map.get(code)
+ if zyltgb and zyltgb < 20 * 100000000:
+ return True, False, f"銆恵block}銆戞定鍋滄暟閲忥紙{len(block_codes)}锛�>=4 鑷敱娴侀�氬競鍊�({zyltgb})灏忎簬20浜�", is_strong_block
return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block
# 杩囨椂鐨勪唬鐮�
@@ -620,7 +634,7 @@
# 濮嬬粓鑾峰彇绮鹃�夋澘鍧�
if True:
# 鑾峰彇
- if k4 and not keys:
+ if k4:
# 褰撴定鍋滃師鍥犳病鏈夋椂鎵嶅彇绮鹃�夋澘鍧�
keys |= k4
keys = keys - constant.KPL_INVALID_BLOCKS
--
Gitblit v1.8.0