From a68342e13d2f11eade054ff1ab3eb496ff266516 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 01 九月 2023 17:44:48 +0800
Subject: [PATCH] 真实下单位置校验
---
third_data/code_plate_key_manager.py | 86 ++++++++++++++++++++++++++++++-------------
1 files changed, 60 insertions(+), 26 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index b5c9398..5d4a496 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -14,38 +14,61 @@
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
+from trade import trade_manager, l2_trade_util
# 浠ｇ爜绮鹃�夋澘鍧楃鐞�
class KPLCodeJXBlockManager:
__redisManager = redis_manager.RedisManager(3)
__code_blocks = {}
+ # 澶囩敤
+ __code_by_blocks = {}
def __get_redis(self):
return self.__redisManager.getRedis()
- def save_jx_blocks(self, code, blocks):
+ def save_jx_blocks(self, code, blocks, by=False):
if blocks is None:
return
+ if len(blocks) > 2:
+ blocks = blocks[:2]
+
# 淇濆瓨鍓�2鏉℃暟鎹�
- RedisUtils.setex(self.__get_redis(), f"kpl_jx_blocks-{code}", tool.get_expire(), json.dumps(blocks))
- self.__code_blocks[code] = blocks
+ if by:
+ RedisUtils.setex(self.__get_redis(), 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))
+ 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
+ def get_jx_blocks(self, code, by=False):
+ if by:
+ if code in self.__code_by_blocks:
+ return self.__code_by_blocks[code]
+ val = RedisUtils.get(self.__get_redis(), f"kpl_jx_blocks_by-{code}")
+ if val is None:
+ return None
+ else:
+ val = json.loads(val)
+ self.__code_by_blocks[code] = val
+ return self.__code_by_blocks[code]
else:
- val = json.loads(val)
- self.__code_blocks[code] = val
- return self.__code_blocks[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]
- def get_jx_blocks_cache(self, code):
- return self.__code_blocks.get(code)
+ def get_jx_blocks_cache(self, code, by=False):
+ if by:
+ return self.__code_by_blocks.get(code)
+ else:
+ return self.__code_blocks.get(code)
# 寮�鐩樺暒绂佹浜ゆ槗鏉垮潡绠＄悊
@@ -364,7 +387,10 @@
k4 = set()
jingxuan_blocks = self.__KPLCodeJXBlockManager.get_jx_blocks_cache(code)
+ if not jingxuan_blocks:
+ jingxuan_blocks = self.__KPLCodeJXBlockManager.get_jx_blocks_cache(code, by=True)
if jingxuan_blocks:
+ jingxuan_blocks = jingxuan_blocks[:2]
k4 |= set([x[1] for x in jingxuan_blocks])
for k in [k1, k11, k2, k3, k4]:
keys |= k
@@ -393,6 +419,15 @@
__CodesTradeStateManager = trade_manager.CodesTradeStateManager()
__can_buy_compute_result_dict = {}
+ @classmethod
+ def __remove_from_l2(cls, code, msg):
+ # 涓嬭繃鍗曠殑浠ｇ爜涓嶇Щ闄�
+ if trade_manager.CodesTradeStateManager().get_trade_state_cache(code) != trade_manager.TRADE_STATE_NOT_TRADE:
+ # 鍙涓嬭繃鍗曠殑灏变笉绉婚櫎
+ return
+ l2_trade_util.forbidden_trade(code)
+ logger_kpl_block_can_buy.info(msg)
+
# 鑾峰彇鍙互涔扮殑鏉垮潡
# current_limit_up_datas: 浠婃棩瀹炴椂娑ㄥ仠
# latest_2_day_limit_up_datas锛氭渶杩�2澶╃殑瀹炴椂娑ㄥ仠锛堜笉鍚粖鏃ワ級
@@ -410,14 +445,9 @@
else:
code_limit_up_reason_dict[d[3]] = d[2]
return code_limit_up_reason_dict
+ if current_limit_up_datas is None:
+ current_limit_up_datas = []
- now_time = int(tool.get_now_time_str().replace(":", ""))
- times = [100000, 103000, 110000, 133000, 150000]
- time_index = 0
- for i in range(len(times)):
- if now_time < times[i]:
- time_index = i
- break
# 鑾峰彇鐩爣浠ｇ爜鏉垮潡
keys, k1, k11, k2, k3, k4 = cls.__TargetCodePlateKeyManager.get_plate_keys(code)
log.logger_kpl_debug.info("{}鍏抽敭璇嶏細浠婃棩-{},浠婃棩鍘嗗彶-{},鍘嗗彶-{},浜岀骇琛屼笟-{},浠ｇ爜鏉垮潡-{}", code, k1, k11, k2, k3, k4)
@@ -466,21 +496,25 @@
code_limit_up_reason_dict)
if pen_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(pen_limit_up_codes) + 1 and record_shsz_rank < len(pen_limit_up_codes) + 1:
# 灞炰簬榫�1,榫�2
can_buy_blocks.append((block,
- f"{block}锛歵op10娑ㄥ仠鏉垮潡锛屼富鏉垮紑1({pen_limit_up_codes}),灞炰簬涓绘澘鍓嶉緳{len(pen_limit_up_codes) + 1}(瀹炴椂韬綅-{current_shsz_rank})"))
+ 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)})"))
continue
else:
+ if record_shsz_rank >= len(pen_limit_up_codes) + 1:
+ cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")
msg_list.append(
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:
- can_buy_blocks.append((block, f"{block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1"))
+ can_buy_blocks.append((block, f"{tool.get_now_time_str()} {block}锛歵op4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1锛屽睘浜庨緳1锛屽疄鏃舵定鍋滃垪琛ㄦ暟閲�({len(current_limit_up_datas)})"))
continue
else:
+ if record_shsz_rank >= 2:
+ cls.__remove_from_l2(code, f"{code}鏍规嵁韬綅绂佹涔板叆锛氥�恵block}銆戝巻鍙茶韩浣峽record_shsz_rank}")
+
msg_list.append(
f"鏉垮潡-{block}: top4娑ㄥ仠鏉垮潡锛岄潪涓绘澘寮�1,涓嶄负涓绘澘榫�1锛堝疄鏃惰韩浣�-{current_shsz_rank},鍘嗗彶韬綅-{record_shsz_rank}锛�")
continue
--
Gitblit v1.8.0