From d6b6be5eb2ae00a8ccf46bd7d53cd7d0c1e59c72 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期五, 24 十一月 2023 19:19:37 +0800 Subject: [PATCH] 初始化独立某些方法 --- third_data/code_plate_key_manager.py | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py index 21662e2..5eea3db 100644 --- a/third_data/code_plate_key_manager.py +++ b/third_data/code_plate_key_manager.py @@ -467,29 +467,36 @@ # msg_list.append(f"\n瀹炴椂top10(娑ㄥ仠鏁伴噺锛歿len(current_limit_up_datas)})") # msg_list.append(f"鍘嗗彶top20(娑ㄥ仠鏁伴噺锛歿len(top_8_record)})") - # 闇�瑕佹帓闄ょ殑浠g爜 - exclude_codes = HighIncreaseCodeManager().list_all() + # 闇�瑕佹帓闄ょ殑鑰佸ぇ鐨勪唬鐮� + exclude_first_codes = HighIncreaseCodeManager().list_all() + + # 鑾峰彇涓绘澘寮�1鐨勪唬鐮� + open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas, + code_limit_up_reason_dict) + # 鍓旈櫎楂樹綅鏉� + if open_limit_up_codes and yesterday_current_limit_up_codes: + open_limit_up_codes -= yesterday_current_limit_up_codes + # 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉� current_shsz_rank, front_current_shsz_rank_codes = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas, code_limit_up_reason_dict, yesterday_current_limit_up_codes, - exclude_codes, + exclude_first_codes, + len(open_limit_up_codes), shsz=True) 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) - # 鑾峰彇涓绘澘鍘嗗彶韬綅 - open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas, - code_limit_up_reason_dict) + if open_limit_up_codes: # 涓绘澘寮�1 if current_shsz_rank < len(open_limit_up_codes) + 1 and record_shsz_rank < len(open_limit_up_codes) + 2: # 灞炰簬榫�1,榫�2 - return True, f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({open_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}/{len(current_limit_up_datas)})" + return True, f"{tool.get_now_time_str()} {block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({open_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank}:{front_current_shsz_rank_codes}/{len(current_limit_up_datas)})" else: if record_shsz_rank >= len(open_limit_up_codes) + 1: cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}") @@ -514,11 +521,12 @@ before_blocks_dict): # 鍔犺浇娑ㄥ仠浠g爜鐨勭洰鏍囨澘鍧� def load_code_block(): - for d in limit_up_record_datas: - if d[2] in constant.KPL_INVALID_BLOCKS and d[3] in before_blocks_dict: - code_limit_up_reason_dict[d[3]] = list(before_blocks_dict.get(d[3]))[0] - else: - code_limit_up_reason_dict[d[3]] = d[2] + if limit_up_record_datas: + for d in limit_up_record_datas: + if d[2] in constant.KPL_INVALID_BLOCKS and d[3] in before_blocks_dict: + code_limit_up_reason_dict[d[3]] = list(before_blocks_dict.get(d[3]))[0] + else: + code_limit_up_reason_dict[d[3]] = d[2] return code_limit_up_reason_dict if current_limit_up_datas is None: -- Gitblit v1.8.0