From cda53e53c3b1c92d289b234a3a0106e66e2cac38 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 27 七月 2023 11:16:53 +0800
Subject: [PATCH] bug修复
---
third_data/code_plate_key_manager.py | 73 +++++++++++++++++++++++++++++-------
1 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 67639df..7eb3c70 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -16,6 +16,34 @@
from trade import trade_manager
+# 浠ｇ爜绮鹃�夋澘鍧楃鐞�
+class KPLCodeJXBlockManager:
+ __redisManager = redis_manager.RedisManager(3)
+ __code_blocks = {}
+
+ def __get_redis(self):
+ return self.__redisManager.getRedis()
+
+ def save_jx_blocks(self, code, blocks):
+ if blocks is None:
+ return
+ # 淇濆瓨鍓�2鏉℃暟鎹�
+ self.__get_redis().setex(f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(blocks))
+ self.__code_blocks[code] = blocks
+
+ # 鑾峰彇绮鹃�夋澘鍧�
+ def get_jx_blocks(self, code):
+ if code in self.__code_blocks:
+ return self.__code_blocks[code]
+ val = self.__get_redis().get(f"kpl_jx_blocks-{code}")
+ if val is None:
+ return None
+ else:
+ val = json.loads(val)
+ self.__code_blocks[code] = val
+ return self.__code_blocks[code]
+
+
# 寮�鐩樺暒绂佹浜ゆ槗鏉垮潡绠＄悊
class KPLPlateForbiddenManager:
__redisManager = redis_manager.RedisManager(3)
@@ -329,13 +357,16 @@
__TargetCodePlateKeyManager = TargetCodePlateKeyManager()
__LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
__CodesHisReasonAndBlocksManager = CodesHisReasonAndBlocksManager()
+ __KPLCodeJXBlockManager = KPLCodeJXBlockManager()
# 鑾峰彇鍙互涔扮殑鏉垮潡
# current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠
# latest_2_day_limit_up_datas锛氭渶杩�2澶╃殑瀹炴椂娑ㄥ仠锛堜笉鍚粖鏃ワ級
# limit_up_record_datas锛氫粖鏃ュ巻鍙叉定鍋�
+ # yesterday_current_limit_up_codes 锛� 鏄ㄦ棩娑ㄥ仠浠ｇ爜
+ # before_blocks_dict锛氬巻鍙叉定鍋滃師鍥�
@classmethod
- def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas,
+ def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,
before_blocks_dict):
# 鍔犺浇娑ㄥ仠浠ｇ爜鐨勭洰鏍囨澘鍧�
def load_code_block():
@@ -366,8 +397,10 @@
if k not in constant.KPL_INVALID_BLOCKS:
keys.add(k)
if not keys:
- if k3:
- keys |= k3
+ # 鑾峰彇
+ jx_blocks = cls.__KPLCodeJXBlockManager.get_jx_blocks(code)
+ if jx_blocks:
+ keys |= set([k[1] for k in jx_blocks[:2]])
log.logger_kpl_debug.info("{}鏈�缁堝叧閿瘝锛歿}", code, keys)
# 娑ㄥ仠鍒楄〃涓尮閰嶅叧閿瘝锛岃繑鍥烇紙鏉垮潡:浠ｇ爜闆嗗悎锛夛紝浠ｇ爜闆嗗悎涓凡缁忔帓闄よ嚜韬�
@@ -377,7 +410,14 @@
load_code_block()
msg_list = []
for block in keys:
- is_top_4 = kpl_block_util.is_top_block(code, block, limit_up_record_datas, 4)
+ is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas,
+ yesterday_current_limit_up_codes, 20)
+ is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas,
+ yesterday_current_limit_up_codes, 10)
+ is_top_4 = is_top_8_record and is_top_4_current
+ msg_list.append(f"\n瀹炴椂top10: {top_4_current}(娑ㄥ仠鏁伴噺锛歿len(current_limit_up_datas)})")
+ msg_list.append(f"鍘嗗彶top20: {top_8_record}")
+
# 鑾峰彇涓绘澘瀹炴椂韬綅
current_shsz_rank = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas,
code_limit_up_reason_dict, shsz=True)
@@ -385,20 +425,20 @@
code_limit_up_reason_dict, shsz=True)
# 鑾峰彇涓绘澘鍘嗗彶韬綅
if is_top_4:
- is_open_limit_up, msg = kpl_block_util.is_shsz_open_limit_up(code, block, limit_up_record_datas,
- code_limit_up_reason_dict)
- if is_open_limit_up:
+ pen_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
+ code_limit_up_reason_dict)
+ if pen_limit_up_codes:
# 涓绘澘寮�1
- if current_shsz_rank < 2 and record_shsz_rank < 2:
+ if current_shsz_rank < len(pen_limit_up_codes) + 1 and record_shsz_rank < len(pen_limit_up_codes) + 1:
# 灞炰簬榫�1,榫�2
- return block, f"top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1,灞炰簬榫�1/榫�2(瀹炴椂韬綅-{current_shsz_rank})"
+ return block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})"
else:
msg_list.append(
- f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽msg}锛�,涓嶄负涓绘澘榫�1榫�2锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
+ f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽pen_limit_up_codes}锛�,涓嶄负涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
else:
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, "top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"
+ return block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"
else:
msg_list.append(
f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
@@ -413,21 +453,24 @@
else:
# 鏄惁涓轰富鏉块緳1锛堝疄鏃堕緳1锛屽巻鍙查緳2浠ュ唴锛�
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, "涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"
+ return block, f"{block}锛氫笉鏄痶op4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"
else:
msg_list.append(
f"鏉垮潡-{block}: 涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
- return None, "\r\n".join(msg_list)
+ return None, "\n".join(msg_list)
# 鏄惁鍙互涓嬪崟
# 杩斿洖锛氭槸鍚﹀彲浠ヤ笅鍗�,娑堟伅,鏉垮潡绫诲瀷
@classmethod
- def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas,before_blocks_dict):
+ def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,
+ before_blocks_dict):
if constant.TEST:
return True, "", cls.BLOCK_TYPE_NONE
+
block, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
- limit_up_record_datas, before_blocks_dict)
+ limit_up_record_datas, yesterday_current_limit_up_codes,
+ before_blocks_dict)
if block is None:
return False, block_msg
--
Gitblit v1.8.0