From c20c3c10635ce78db4a86ce9c0bb1d02e90f525d Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 08 八月 2023 17:40:42 +0800
Subject: [PATCH] 单例+缓存优化
---
third_data/code_plate_key_manager.py | 71 ++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index a34dc57..173a83b 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -29,7 +29,7 @@
if blocks is None:
return
# 淇濆瓨鍓�2鏉℃暟鎹�
- RedisUtils.setex(self.__get_redis(),f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(blocks))
+ RedisUtils.setex(self.__get_redis(), f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(blocks))
self.__code_blocks[code] = blocks
# 鑾峰彇绮鹃�夋澘鍧�
@@ -92,7 +92,7 @@
# 浠婃棩娑ㄥ仠鍘熷洜鍙樺寲
def set_today_limit_up_reason_change(self, code, from_reason, to_reason):
RedisUtils.sadd(self.__get_redis(), f"kpl_limit_up_reason_his-{code}", from_reason)
- self.__get_redis().expire(f"kpl_limit_up_reason_his-{code}", tool.get_expire())
+ RedisUtils.expire(self.__get_redis(), f"kpl_limit_up_reason_his-{code}", tool.get_expire())
self.__set_total_keys(code)
# 璁剧疆浠ｇ爜鐨勪粖鏃ユ定鍋滃師鍥�
@@ -259,7 +259,8 @@
def set_history_limit_up_reason(self, code, reasons):
self.__history_limit_up_reason_dict[code] = set(reasons)
- RedisUtils.setex(self.__get_redis(),f"kpl_his_limit_up_reason-{code}", tool.get_expire(), json.dumps(list(reasons)))
+ RedisUtils.setex(self.__get_redis(), f"kpl_his_limit_up_reason-{code}", tool.get_expire(),
+ json.dumps(list(reasons)))
logger_kpl_debug.debug(f"璁剧疆鍘嗗彶娑ㄥ仠鍘熷洜锛歿code}-{reasons}")
# 濡傛灉杩斿洖鍊间笉涓篘one琛ㄧず宸茬粡鍔犺浇杩囧巻鍙插師鍥犱簡
@@ -267,7 +268,7 @@
reasons = self.__history_limit_up_reason_dict.get(code)
if reasons is None:
# 浠庡唴瀛樹腑鍔犺浇
- val = self.__get_redis().get(f"kpl_his_limit_up_reason-{code}")
+ val = RedisUtils.get(self.__get_redis(), f"kpl_his_limit_up_reason-{code}")
if val is not None:
val = set(json.loads(val))
self.__history_limit_up_reason_dict[code] = val
@@ -280,13 +281,13 @@
def set_blocks(self, code, blocks):
self.__blocks_dict[code] = set(blocks)
- RedisUtils.setex(self.__get_redis(),f"kpl_blocks-{code}", tool.get_expire(), json.dumps(list(blocks)))
+ RedisUtils.setex(self.__get_redis(), f"kpl_blocks-{code}", tool.get_expire(), json.dumps(list(blocks)))
def get_blocks(self, code):
reasons = self.__blocks_dict.get(code)
if reasons is None:
# 浠庡唴瀛樹腑鍔犺浇
- val = self.__get_redis().get(f"kpl_blocks-{code}")
+ val = RedisUtils.get(self.__get_redis(), f"kpl_blocks-{code}")
if val is not None:
val = set(json.loads(val))
self.__blocks_dict[code] = val
@@ -311,11 +312,12 @@
class TargetCodePlateKeyManager:
__redisManager = redis_manager.RedisManager(1)
__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
+ __KPLCodeJXBlockManager = KPLCodeJXBlockManager()
def __get_redis(self):
return self.__redisManager.getRedis()
- # 杩斿洖key闆嗗悎(鎺掗櫎鏃犳晥鏉垮潡),浠婃棩娑ㄥ仠鍘熷洜,浠婃棩鍘嗗彶娑ㄥ仠鍘熷洜,鍘嗗彶娑ㄥ仠鍘熷洜,浜岀骇,鏉垮潡
+ # 杩斿洖key闆嗗悎(鎺掗櫎鏃犳晥鏉垮潡),浠婃棩娑ㄥ仠鍘熷洜,浠婃棩鍘嗗彶娑ㄥ仠鍘熷洜,鍘嗗彶娑ㄥ仠鍘熷洜,浜岀骇,绮鹃�夋澘鍧�
def get_plate_keys(self, code):
keys = set()
k1 = set()
@@ -331,9 +333,10 @@
if industry:
k3 = {industry}
- k4 = self.__CodesPlateKeysManager.get_blocks(code)
- if k4 is None:
- k4 = set()
+ k4 = set()
+ jingxuan_blocks = self.__KPLCodeJXBlockManager.get_jx_blocks(code)
+ if jingxuan_blocks:
+ k4 |= set([x[1] for x in jingxuan_blocks])
for k in [k1, k11, k2, k3, k4]:
keys |= k
@@ -358,7 +361,7 @@
__TargetCodePlateKeyManager = TargetCodePlateKeyManager()
__LimitUpCodesPlateKeyManager = LimitUpCodesPlateKeyManager()
__CodesHisReasonAndBlocksManager = CodesHisReasonAndBlocksManager()
- __KPLCodeJXBlockManager = KPLCodeJXBlockManager()
+
# 鑾峰彇鍙互涔扮殑鏉垮潡
# current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠
@@ -397,16 +400,16 @@
for k in k2:
if k not in constant.KPL_INVALID_BLOCKS:
keys.add(k)
- if not keys:
+ # 濮嬬粓鑾峰彇绮鹃�夋澘鍧�
+ if True:
# 鑾峰彇
- jx_blocks = cls.__KPLCodeJXBlockManager.get_jx_blocks(code)
- if jx_blocks:
- keys |= set([k[1] for k in jx_blocks[:2]])
+ if k4:
+ keys |= k4
log.logger_kpl_debug.info("{}鏈�缁堝叧閿瘝锛歿}", code, keys)
# 娑ㄥ仠鍒楄〃涓尮閰嶅叧閿瘝锛岃繑鍥烇紙鏉垮潡:浠ｇ爜闆嗗悎锛夛紝浠ｇ爜闆嗗悎涓凡缁忔帓闄よ嚜韬�
if not keys:
- return cls.BLOCK_TYPE_NONE, None, "灏氭湭鎵惧埌娑ㄥ仠鍘熷洜"
+ return None, "灏氭湭鎵惧埌娑ㄥ仠鍘熷洜"
code_limit_up_reason_dict = {}
load_code_block()
msg_list = []
@@ -414,18 +417,18 @@
can_buy_blocks = []
for block in keys:
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)
+ 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,
- yesterday_current_limit_up_codes, 10)
+ yesterday_current_limit_up_codes, 50)
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}")
+ msg_list.append(f"\n瀹炴椂top10(娑ㄥ仠鏁伴噺锛歿len(current_limit_up_datas)})")
+ 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, shsz=True)
+ 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, shsz=True)
+ code_limit_up_reason_dict, yesterday_current_limit_up_codes, shsz=True)
# 鑾峰彇涓绘澘鍘嗗彶韬綅
if is_top_4:
pen_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
@@ -436,7 +439,7 @@
pen_limit_up_codes) + 1:
# 灞炰簬榫�1,榫�2
can_buy_blocks.append((block,
- f"{block}锛歵op4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})"))
+ f"{block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})"))
continue
else:
msg_list.append(
@@ -467,7 +470,7 @@
f"鏉垮潡-{block}: 涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
if len(can_buy_blocks) == len(keys):
- blocks = "/".join([x[0] for x in can_buy_blocks])
+ blocks = [x[0] for x in can_buy_blocks]
blocks_msg = "\n".join([x[1] for x in can_buy_blocks])
return blocks, blocks_msg
@@ -481,10 +484,10 @@
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, yesterday_current_limit_up_codes,
- before_blocks_dict)
- if block is None:
+ blocks, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
+ limit_up_record_datas, yesterday_current_limit_up_codes,
+ before_blocks_dict)
+ if not blocks:
return False, block_msg
# ---------------------------------鍒ゆ柇鐩爣浠ｇ爜鐨勬澘鍧�-------------------start------------
@@ -535,9 +538,9 @@
# ---------------------------------鍔犺浇宸茬粡涓嬪崟/鎴愪氦鐨勪唬鐮佷俊鎭�------------start-------------
# match_reasons = match_limit_up_result.keys()
# 鍒ゆ柇鍖归厤鍒扮殑鍘熷洜鏄惁宸茬粡鏈変笅鍗�/涔板叆鎴愬姛鐨勪唬鐮�
- codes_delegate = set(trade_manager.get_codes_by_trade_states(
+ codes_delegate = set(trade_manager.CodesTradeStateManager().get_codes_by_trade_states_cache(
{trade_manager.TRADE_STATE_BUY_DELEGATED, trade_manager.TRADE_STATE_BUY_PLACE_ORDER}))
- codes_success = set(trade_manager.get_codes_by_trade_states(
+ codes_success = set(trade_manager.CodesTradeStateManager().get_codes_by_trade_states_cache(
{trade_manager.TRADE_STATE_BUY_SUCCESS}))
codes = codes_delegate | codes_success
@@ -549,7 +552,7 @@
for c in codes:
keys_, k1_, k11_, k2_, k3_, k4_ = cls.__TargetCodePlateKeyManager.get_plate_keys(c)
# 瀹炴椂娑ㄥ仠鍘熷洜
- trade_codes_blocks_dict[c] = k1_
+ trade_codes_blocks_dict[c] = k1_|k4_
# 缁熻鏉垮潡涓殑浠ｇ爜
trade_block_codes_dict = {}
for c in trade_codes_blocks_dict:
@@ -565,11 +568,11 @@
# ---------------------------------鍔犺浇宸茬粡涓嬪崟/鎴愪氦鐨勪唬鐮佷俊鎭�------------end-------------
msg_list = []
- for key in [block]:
+ for key in blocks:
# 鏉垮潡涓凡缁忔湁鎴愪氦鐨勫氨涓嶄笅鍗曚簡
if key in trade_success_blocks_count:
success_codes_count = len(trade_success_blocks_count[key])
- if success_codes_count >= 2:
+ if success_codes_count >= 1:
msg_list.append(f"銆恵key}銆戜腑宸茬粡鏈墈success_codes_count}涓垚浜や唬鐮�")
log.logger_kpl_debug.debug(f"{code}锛氭澘鍧楋紙{key}锛夊凡缁忔湁鎴愪氦銆恵trade_success_blocks_count[key]}銆�")
continue
--
Gitblit v1.8.0