From 5ed30c03ddfedd4cf79cd8fea9fc45b05821d898 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 16 十月 2023 12:44:07 +0800
Subject: [PATCH] 真实下单位置计算方法修改
---
third_data/code_plate_key_manager.py | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index 7bdc115..a3e8e85 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -19,10 +19,18 @@
# 浠ｇ爜绮鹃�夋澘鍧楃鐞�
class KPLCodeJXBlockManager:
+ __db = 3
__redisManager = redis_manager.RedisManager(3)
__code_blocks = {}
# 澶囩敤
__code_by_blocks = {}
+
+ __instance = None
+
+ def __new__(cls, *args, **kwargs):
+ if not cls.__instance:
+ cls.__instance = super(KPLCodeJXBlockManager, cls).__new__(cls, *args, **kwargs)
+ return cls.__instance
def __get_redis(self):
return self.__redisManager.getRedis()
@@ -35,10 +43,10 @@
# 淇濆瓨鍓�2鏉℃暟鎹�
if by:
- RedisUtils.setex(self.__get_redis(), f"kpl_jx_blocks_by-{code}", tool.get_expire(), json.dumps(blocks))
+ RedisUtils.setex_async(self.__db, f"kpl_jx_blocks_by-{code}", tool.get_expire(), json.dumps(blocks))
self.__code_by_blocks[code] = blocks
else:
- RedisUtils.setex(self.__get_redis(), f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(blocks))
+ RedisUtils.setex_async(self.__db, f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(blocks))
self.__code_blocks[code] = blocks
# 鑾峰彇绮鹃�夋澘鍧�
@@ -421,6 +429,8 @@
@classmethod
def __remove_from_l2(cls, code, msg):
+ # 鏍规嵁韬綅绉婚櫎浠ｇ爜
+ # return
# 涓嬭繃鍗曠殑浠ｇ爜涓嶇Щ闄�
if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) != trade_manager.TRADE_STATE_NOT_TRADE:
# 鍙涓嬭繃鍗曠殑灏变笉绉婚櫎
@@ -431,7 +441,7 @@
@classmethod
def __is_block_can_buy(cls, code, block, current_limit_up_datas, code_limit_up_reason_dict,
yesterday_current_limit_up_codes, limit_up_record_datas):
- log.logger_kpl_debug.info(f"鍒ゆ柇鏉垮潡鏄惁鍙拱锛歿block}")
+ # log.logger_kpl_debug.info(f"鍒ゆ柇鏉垮潡鏄惁鍙拱锛歿block}")
# 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, 50)
# is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas,
@@ -441,25 +451,29 @@
# msg_list.append(f"鍘嗗彶top20(娑ㄥ仠鏁伴噺锛歿len(top_8_record)})")
# 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
- current_shsz_rank = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas,
- code_limit_up_reason_dict,
- yesterday_current_limit_up_codes, shsz=True)
- record_shsz_rank = 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)
+ 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,
+ 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)
# 鑾峰彇涓绘澘鍘嗗彶韬綅
- 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:
+ 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(pen_limit_up_codes) + 1 and record_shsz_rank < len(pen_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({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_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}/{len(current_limit_up_datas)})"
else:
- if record_shsz_rank >= len(pen_limit_up_codes) + 1:
+ if record_shsz_rank >= len(open_limit_up_codes) + 1:
cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")
- return False, f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽pen_limit_up_codes}锛�,涓嶄负涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�"
+ return False, f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1锛坽open_limit_up_codes}锛�,涓嶄负涓绘澘鍓嶉緳{len(open_limit_up_codes) + 1}锛堝疄鏃惰韩浣�-{current_shsz_rank}:{front_current_shsz_rank_codes},鍘嗗彶韬綅-{record_shsz_rank}锛�"
else:
if current_shsz_rank == 0 and record_shsz_rank < 2:
return True, f"{tool.get_now_time_str()} {block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1锛屽疄鏃舵定鍋滃垪琛ㄦ暟閲�({len(current_limit_up_datas)})"
@@ -467,7 +481,7 @@
if record_shsz_rank >= 2:
cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")
- return False, f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�"
+ return False, f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank}:{front_current_shsz_rank_codes},鍘嗗彶韬綅-{record_shsz_rank}锛�"
# 鑾峰彇鍙互涔扮殑鏉垮潡
# current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠
@@ -492,7 +506,7 @@
# 鑾峰彇鐩爣浠ｇ爜鏉垮潡
keys, k1, k11, k2, k3, k4 = cls.__TargetCodePlateKeyManager.get_plate_keys(code)
- log.logger_kpl_debug.info("{}鍏抽敭璇嶏細浠婃棩-{},浠婃棩鍘嗗彶-{},鍘嗗彶-{},浜岀骇琛屼笟-{},浠ｇ爜鏉垮潡-{}", code, k1, k11, k2, k3, k4)
+ # log.logger_kpl_debug.info("{}鍏抽敭璇嶏細浠婃棩-{},浠婃棩鍘嗗彶-{},鍘嗗彶-{},浜岀骇琛屼笟-{},浠ｇ爜鏉垮潡-{}", code, k1, k11, k2, k3, k4)
keys = set()
if k1:
for k in k1:
@@ -536,6 +550,9 @@
def can_buy(cls, code):
if constant.TEST:
return True, cls.BLOCK_TYPE_NONE
+ # if True:
+ # # 娴嬭瘯
+ # return True, "涓嶅垽鏂澘鍧楄韩浣�"
return cls.__can_buy_compute_result_dict.get(code)
@classmethod
@@ -547,7 +564,6 @@
before_blocks_dict)
if not blocks:
return False, block_msg
- log.logger_kpl_debug.info(f"{code}:鑾峰彇濮旀墭/涔板叆浠ｇ爜")
codes_delegate = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
{trade_manager.TRADE_STATE_BUY_DELEGATED, trade_manager.TRADE_STATE_BUY_PLACE_ORDER}))
codes_success = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
@@ -559,13 +575,11 @@
trade_codes_blocks_dict = {}
# 宸茬粡鎴愪氦鐨勬澘鍧�
trade_success_blocks_count = {}
- log.logger_kpl_debug.info(f"{code}:鑾峰彇浠ｇ爜鏉垮潡")
for c in codes:
keys_, k1_, k11_, k2_, k3_, k4_ = cls.__TargetCodePlateKeyManager.get_plate_keys(c)
# 瀹炴椂娑ㄥ仠鍘熷洜
trade_codes_blocks_dict[c] = k1_ | k4_
# 缁熻鏉垮潡涓殑浠ｇ爜
- log.logger_kpl_debug.info(f"{code}:缁熻鏉垮潡涓殑浠ｇ爜")
trade_block_codes_dict = {}
for c in trade_codes_blocks_dict:
for b in trade_codes_blocks_dict[c]:
@@ -578,7 +592,6 @@
trade_block_codes_dict[b].add(c)
# ---------------------------------鍔犺浇宸茬粡涓嬪崟/鎴愪氦鐨勪唬鐮佷俊鎭�------------end-------------
- log.logger_kpl_debug.info(f"{code}:寮�濮嬭绠楁槸鍚﹀彲浠ヤ拱")
msg_list = []
for key in blocks:
# 鏉垮潡涓凡缁忔湁鎴愪氦鐨勫氨涓嶄笅鍗曚簡
--
Gitblit v1.8.0