From b4480ad745510c8e81c88c20fb67cb65eef79cc5 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 17 八月 2023 11:05:23 +0800
Subject: [PATCH] ++++++++++++++++ bug修复
---
third_data/code_plate_key_manager.py | 181 ++++++++++++++++++++++++++++++++-------------
1 files changed, 129 insertions(+), 52 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index cb77e22..8e36034 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -6,29 +6,80 @@
import json
import constant
+from db.redis_manager_delegate import RedisUtils
from third_data import kpl_block_util
from utils import global_util, tool
from log_module import log
-from db import redis_manager
+from db import redis_manager_delegate as redis_manager
from log_module.log import logger_kpl_limit_up, logger_kpl_block_can_buy, logger_kpl_debug
from third_data.kpl_util import KPLPlatManager
from trade import trade_manager
-# 寮�鐩樺暒绂佹浜ゆ槗鏉垮潡绠＄悊
-class KPLPlateForbiddenManager:
+# 浠ｇ爜绮鹃�夋澘鍧楃鐞�
+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鏉℃暟鎹�
+ RedisUtils.setex(self.__get_redis(), 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 = RedisUtils.get(self.__get_redis(), 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)
+ __kpl_forbidden_plates_cache = set()
+
+ __instance = None
+
+ def __new__(cls, *args, **kwargs):
+ if not cls.__instance:
+ cls.__instance = super(KPLPlateForbiddenManager, cls).__new__(cls, *args, **kwargs)
+ cls.__load_datas()
+ return cls.__instance
+
+ @classmethod
+ def __load_datas(cls):
+ __redis = cls.__get_redis()
+ try:
+ __kpl_forbidden_plates_cache = RedisUtils.smembers(__redis, "kpl_forbidden_plates")
+ finally:
+ RedisUtils.realse(__redis)
+
+ @classmethod
+ def __get_redis(cls):
+ return cls.__redisManager.getRedis()
+
def save_plate(self, plate):
- self.__get_redis().sadd("kpl_forbidden_plates", plate)
- self.__get_redis().expire("kpl_forbidden_plates", tool.get_expire())
+ self.__kpl_forbidden_plates_cache.add(plate)
+ RedisUtils.sadd(self.__get_redis(), "kpl_forbidden_plates", plate)
+ RedisUtils.expire(self.__get_redis(), "kpl_forbidden_plates", tool.get_expire())
def list_all(self):
- return self.__get_redis().smembers("kpl_forbidden_plates")
+ return RedisUtils.smembers(self.__get_redis(), "kpl_forbidden_plates")
+
+ def list_all_cache(self):
+ return self.__kpl_forbidden_plates_cache
class LimitUpCodesPlateKeyManager:
@@ -62,8 +113,8 @@
# 浠婃棩娑ㄥ仠鍘熷洜鍙樺寲
def set_today_limit_up_reason_change(self, code, from_reason, to_reason):
- self.__get_redis().sadd(f"kpl_limit_up_reason_his-{code}", from_reason)
- self.__get_redis().expire(f"kpl_limit_up_reason_his-{code}", tool.get_expire())
+ RedisUtils.sadd(self.__get_redis(), f"kpl_limit_up_reason_his-{code}", from_reason)
+ RedisUtils.expire(self.__get_redis(), f"kpl_limit_up_reason_his-{code}", tool.get_expire())
self.__set_total_keys(code)
# 璁剧疆浠ｇ爜鐨勪粖鏃ユ定鍋滃師鍥�
@@ -188,7 +239,7 @@
# 鍚庢帓鎵嶈兘鎸傚崟
return 0, "韬綅涓嶄负鍚庢帓"
- forbidden_plates = cls.__KPLPlateForbiddenManager.list_all()
+ forbidden_plates = cls.__KPLPlateForbiddenManager.list_all_cache()
if key in forbidden_plates:
return 0, "涓嶄拱璇ユ澘鍧�"
@@ -207,7 +258,7 @@
def is_in_top(cls, keys):
reasons = cls.get_can_buy_key_set()
log.logger_kpl_debug.debug("甯傚満娴佸叆鍓�5:{}", reasons)
- forbidden_plates = cls.__KPLPlateForbiddenManager.list_all()
+ forbidden_plates = cls.__KPLPlateForbiddenManager.list_all_cache()
reasons = reasons - forbidden_plates
temp_set = keys & reasons
log.logger_kpl_debug.debug("甯傚満娴佸叆鍓�5鍖归厤缁撴灉:{}", temp_set)
@@ -230,7 +281,8 @@
def set_history_limit_up_reason(self, code, reasons):
self.__history_limit_up_reason_dict[code] = set(reasons)
- self.__get_redis().setex(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琛ㄧず宸茬粡鍔犺浇杩囧巻鍙插師鍥犱簡
@@ -238,7 +290,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
@@ -251,13 +303,13 @@
def set_blocks(self, code, blocks):
self.__blocks_dict[code] = set(blocks)
- self.__get_redis().setex(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
@@ -282,18 +334,19 @@
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()
if code in LimitUpCodesPlateKeyManager.today_total_limit_up_reason_dict:
k1 = {LimitUpCodesPlateKeyManager.today_total_limit_up_reason_dict[code]}
- # 鍔犺浇浠婃棩鍘嗗彶鍘熷洜
- k11 = self.__get_redis().smembers(f"kpl_limit_up_reason_his-{code}")
+ # 鍔犺浇浠婃棩鍘嗗彶鍘熷洜,鏆傛椂涓嶉渶瑕佸巻鍙插師鍥犱簡
+ k11 = set() # RedisUtils.smembers(self.__get_redis(), f"kpl_limit_up_reason_his-{code}")
k2 = self.__CodesPlateKeysManager.get_history_limit_up_reason(code)
if k2 is None:
k2 = set()
@@ -302,9 +355,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
@@ -334,8 +388,10 @@
# 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():
@@ -365,45 +421,57 @@
for k in k2:
if k not in constant.KPL_INVALID_BLOCKS:
keys.add(k)
- if not keys:
- if k3:
- keys |= k3
+ # 濮嬬粓鑾峰彇绮鹃�夋澘鍧�
+ if True:
+ # 鑾峰彇
+ 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 = []
- for block in keys:
- is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas, 8)
- is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas, 4)
- is_top_4 = is_top_8_record and is_top_4_current
- msg_list.append(f"瀹炴椂top4: {top_4_current}")
- msg_list.append(f"鍘嗗彶top8: {top_8_record}")
- # 鑾峰彇涓绘澘瀹炴椂韬綅
+ 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, 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, 50)
+ is_top_4 = is_top_8_record and is_top_4_current
+ 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:
- 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"{block}锛歵op4娑ㄥ仠鏉垮潡锛屼富鏉垮紑1,灞炰簬榫�1/榫�2(瀹炴椂韬綅-{current_shsz_rank})"
+ can_buy_blocks.append((block,
+ f"{block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})"))
+ continue
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, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"
+ can_buy_blocks.append((block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"))
+ continue
else:
msg_list.append(
f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
@@ -418,22 +486,31 @@
else:
# 鏄惁涓轰富鏉块緳1锛堝疄鏃堕緳1锛屽巻鍙查緳2浠ュ唴锛�
if current_shsz_rank == 0 and record_shsz_rank < 2:
- return block, f"{block}锛氫笉鏄痶op4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"
+ can_buy_blocks.append((block, f"{block}锛氫笉鏄痶op4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰锛屾弧瓒充富鏉块緳1"))
+ continue
else:
msg_list.append(
f"鏉垮潡-{block}: 涓嶆槸top4娑ㄥ仠鏉垮潡锛屾弧瓒崇簿閫�/琛屼笟娴佸叆瑕佹眰,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
- return None, "\r\n".join(msg_list)
+ if len(can_buy_blocks) == len(keys):
+ 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
+
+ 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)
- 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------------
@@ -484,9 +561,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
@@ -498,7 +575,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:
@@ -514,11 +591,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