From d2d5ca80907183f88a5e78aa28c085a746868d6d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 13 十一月 2024 18:50:56 +0800
Subject: [PATCH] 扫入策略修改
---
third_data/code_plate_key_manager.py | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 0ea4094..c4a3814 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -353,12 +353,25 @@
@param datas:
@return:
"""
+ # blocks = set()
+ # 鑰佺増鏈疄鐜版柟寮�
+ # for data in datas:
+ # if data[3] <= 0:
+ # break
+ # blocks.add(data[1])
+ # cls.__top_jx_blocks = blocks
blocks = set()
for data in datas:
- if data[3] <= 0:
- break
+ if data[1] in constant.KPL_INVALID_BLOCKS:
+ continue
+ if data[3] < 1e8:
+ continue
blocks.add(data[1])
- cls.__top_jx_blocks = blocks
+ if len(blocks) >= 10:
+ break
+ blocks.add(kpl_util.filter_block(data[1]))
+ # 璁板綍绮鹃�夋祦鍑烘棩蹇�
+ cls.__top_jx_blocks = BlockMapManager().filter_blocks(blocks)
@classmethod
def set_market_jingxuan_out_blocks(cls, datas):
@@ -368,19 +381,19 @@
@return:
"""
blocks = set()
- for i in range(0, len(datas)):
- if i >= 10 and int(tool.get_now_time_str().replace(":", "")) < int("100000"):
- # 10鐐瑰墠鐪嬪墠10锛屽崄鐐瑰悗涓嶇湅鍓�10
- break
- data = datas[i]
- if data[3] > 0 - 5e7:
+ for data in datas:
+ if data[1] in constant.KPL_INVALID_BLOCKS:
+ continue
+ if data[3] > -1e8:
# 杩囨护5鍗冧竾浠ヤ笂鐨�
break
+ blocks.add(data[1])
+ if len(blocks) >= 10:
+ break
blocks.add(kpl_util.filter_block(data[1]))
-
# 璁板綍绮鹃�夋祦鍑烘棩蹇�
async_log_util.info(logger_kpl_jx_out, f"鍘熸暟鎹細{datas[:10]} 鏉垮潡锛歿blocks}")
- cls.__top_jx_out_blocks = blocks
+ cls.__top_jx_out_blocks = BlockMapManager().filter_blocks(blocks)
@classmethod
def get_top_market_jingxuan_blocks(cls):
@@ -1103,5 +1116,6 @@
cls.__can_buy_compute_result_dict[code] = (
can_buy_blocks, unique, msg, can_buy_strong_blocks, keys, active_buy_blocks)
+
if __name__ == "__main__":
pass
--
Gitblit v1.8.0