From 21c96ed504f93f16ce6f8a3ccf164a87c9edd9c0 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 30 一月 2024 15:45:23 +0800
Subject: [PATCH] 增加调试日志
---
third_data/code_plate_key_manager.py | 156 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 120 insertions(+), 36 deletions(-)
diff --git a/third_data/code_plate_key_manager.py b/third_data/code_plate_key_manager.py
index b411f39..3715995 100644
--- a/third_data/code_plate_key_manager.py
+++ b/third_data/code_plate_key_manager.py
@@ -8,9 +8,11 @@
import time
import constant
+from code_attribute import code_nature_analyse
from db.redis_manager_delegate import RedisUtils
-from third_data import kpl_block_util, kpl_api
-from utils import global_util, tool
+from third_data import kpl_block_util, kpl_api, kpl_util
+from trade.trade_manager import MarketSituationManager
+from utils import global_util, tool, buy_condition_util
from log_module import log, async_log_util
from db import redis_manager_delegate as redis_manager
@@ -43,11 +45,8 @@
final_blocks = copy.deepcopy(blocks)
if len(blocks) > 2:
final_blocks.clear()
- # 鏍规嵁娑ㄥ箙鎺掑簭
- blocks.sort(key=lambda x: x[2])
- blocks.reverse()
for b in blocks:
- if b[1] not in constant.KPL_INVALID_BLOCKS:
+ if b not in constant.KPL_INVALID_BLOCKS:
final_blocks.append(b)
if len(final_blocks) < 2:
final_blocks = blocks
@@ -100,7 +99,7 @@
if price_rate > 0.07:
jx_blocks_info = self.get_jx_blocks_cache(code)
if not jx_blocks_info:
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�-{blocks}")
else:
@@ -118,14 +117,14 @@
if time.time() - jx_blocks_info[1] > UPDATE_TIME_SPACE:
# 璺濈涓婃鏇存柊鏃堕棿杩囧幓浜�5鍒嗛挓
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧楋紙鏇存柊锛�-{blocks}")
elif price_rate > 0.03:
# 娣诲姞澶囩敤鏉垮潡
if not self.get_jx_blocks_cache(code, by=True):
- blocks = kpl_api.getCodeJingXuanBlocks(code)
+ blocks = kpl_api.getCodeBlocks(code)
self.save_jx_blocks(code, blocks, current_limit_up_blocks, by=True)
async_log_util.info(logger_kpl_block_can_buy, f"{code}:鑾峰彇鍒扮簿閫夋澘鍧�(澶囩敤)-{blocks}")
except Exception as e:
@@ -450,7 +449,7 @@
jingxuan_block_info = self.__KPLCodeJXBlockManager.get_jx_blocks_cache(code, by=True)
if jingxuan_block_info:
jingxuan_blocks = jingxuan_block_info[0]
- k4 |= set([x[1] for x in jingxuan_blocks])
+ k4 |= set(jingxuan_blocks) # set([x[1] for x in jingxuan_blocks])
for k in [k1, k11, k2, k3, k4]:
keys |= k
@@ -491,14 +490,24 @@
# 杩斿洖鍐呭(鏄惁鍙拱, 鏄惁涓虹嫭鑻�, 鎻忚堪淇℃伅)
@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, current_limit_up_block_codes_dict):
+ def __is_block_can_buy(cls, code, block, current_limit_up_datas, code_limit_up_reasons_dict,
+ yesterday_current_limit_up_codes, limit_up_record_datas, current_limit_up_block_codes_dict,
+ high_level_code_blocks=None, high_level_block_codes=None):
# 鐙嫍鍒ゆ柇
+ if high_level_code_blocks is None:
+ high_level_code_blocks = {}
+ if high_level_block_codes is None:
+ high_level_block_codes = {}
block_codes = current_limit_up_block_codes_dict.get(block)
+ if block_codes is None:
+ block_codes = set()
if not block_codes:
- return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False
+ # 楂樹綅鏉挎硾鍖栨澘鍧椾腑鏃犳澘鍧�
+ if not high_level_block_codes.get(block):
+ return False, True, f"{block}:鏉垮潡鏃犳定鍋�", False
elif len(block_codes) == 1 and code in block_codes:
- return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False
+ if not high_level_block_codes.get(block):
+ return False, True, f"{block}:鏉垮潡鍙湁褰撳墠浠ｇ爜娑ㄥ仠", False
# 鍙互涔扮殑鏈�澶ф帓鍚�
# open_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
# code_limit_up_reason_dict)
@@ -508,15 +517,28 @@
# ---------------------------鍒ゆ柇寮哄娍涓荤嚎-------------------------
is_strong_block = False
for d in current_limit_up_datas:
- if d[5] != block:
- continue
- if d[4].find("杩炴澘") > 0:
- if d[4].replace("杩炴澘", "").isdigit():
- count = int(d[4].replace("杩炴澘", ""))
- if count >= 3:
- is_strong_block = True
- break
+ bs = kpl_util.get_current_limit_up_reasons(d)
+ if block not in bs:
+ general_blocks = high_level_code_blocks.get(d[0])
+ if not general_blocks or block not in general_blocks:
+ # 娌″湪娉涘寲鏉垮潡涓�
+ continue
+ count = kpl_util.get_high_level_count(d[4])
+ if count >= 3:
+ if d[4].find("杩炴澘") > 0:
+ is_strong_block = True
+ break
+ elif d[0] in yesterday_current_limit_up_codes and len(block_codes) >= 2:
+ # 鍑犲ぉ鍑犳澘锛屼笖鏈�杩�2杩炴澘
+ # 鐪嬫槸鍚︽湁棣栨澘鍚庢帓
+ is_strong_block = True
+ break
+ if not is_strong_block:
+ temp_block_codes = set(copy.deepcopy(block_codes))
+ temp_block_codes.discard(code)
+ if len(temp_block_codes) >= 3:
+ is_strong_block = True
max_rank = 2
# 寮哄娍鏉垮潡涔拌�佸洓
if is_strong_block:
@@ -531,15 +553,22 @@
if current_open_limit_up_codes and yesterday_current_limit_up_codes:
current_open_limit_up_codes -= yesterday_current_limit_up_codes
+ # 鑾峰彇浠ｇ爜鐨勫垵娆℃定鍋滄椂闂�
+ first_limit_up_time = time.time()
+ for r in limit_up_record_datas:
+ if r[3] == code:
+ first_limit_up_time = int(r[5])
+
# 鑾峰彇涓绘澘瀹炴椂韬綅,鍓旈櫎楂樹綅鏉�
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,
+ code_limit_up_reasons_dict,
yesterday_current_limit_up_codes,
exclude_first_codes,
len(
current_open_limit_up_codes),
- shsz=True)
+ shsz=True,
+ limit_up_time=first_limit_up_time)
# 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,
@@ -552,6 +581,17 @@
if current_shsz_rank < len(current_open_limit_up_codes) + max_rank:
return True, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{current_shsz_rank}", is_strong_block
else:
+ # k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
+ # if k_format and k_format[8][0]:
+ # # 鍏锋湁杈ㄨ瘑搴�
+ # return True, False, f"銆恵block}銆戝叿鏈夎鲸璇嗗害", is_strong_block
+ # 鐪嬭嚜鐢辨祦閫氬競鍊兼槸鍚﹀皬浜�20浜�
+ if is_strong_block and current_shsz_rank < len(current_open_limit_up_codes) + max_rank + 1:
+ zyltgb_as_yi = round(global_util.zyltgb_map.get(code) / 100000000, 2) if code in global_util.zyltgb_map else None
+ situation = MarketSituationManager().get_situation_cache()
+ zylt_threshold_as_yi = buy_condition_util.get_zyltgb_threshold(situation)
+ if zyltgb_as_yi and zylt_threshold_as_yi[2] <= zyltgb_as_yi <= zylt_threshold_as_yi[3]:
+ return True, False, f"銆恵block}銆戝己鍔挎澘鍧� 鑷敱娴侀�氬競鍊�({zyltgb_as_yi})澶т簬{zylt_threshold_as_yi[2]}浜� 灏忎簬{zylt_threshold_as_yi[3]}浜�", is_strong_block
return False, False, f"銆恵block}銆戝墠鎺掍唬鐮侊細{front_current_shsz_rank_codes} 瓒呰繃{len(current_open_limit_up_codes) + max_rank}涓�", is_strong_block
# 杩囨椂鐨勪唬鐮�
@@ -583,16 +623,19 @@
@classmethod
def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,
- before_blocks_dict, current_limit_up_block_codes_dict):
+ before_blocks_dict, current_limit_up_block_codes_dict, high_level_general_code_blocks,
+ high_level_general_block_codes):
# 鍔犺浇娑ㄥ仠浠ｇ爜鐨勭洰鏍囨澘鍧�
def load_code_block():
if limit_up_record_datas:
for d in limit_up_record_datas:
if d[2] in constant.KPL_INVALID_BLOCKS and d[3] in before_blocks_dict:
- code_limit_up_reason_dict[d[3]] = list(before_blocks_dict.get(d[3]))[0]
+ code_limit_up_reasons_dict[d[3]] = {list(before_blocks_dict.get(d[3]))[0]}
else:
- code_limit_up_reason_dict[d[3]] = d[2]
- return code_limit_up_reason_dict
+ code_limit_up_reasons_dict[d[3]] = {d[2]}
+ if d[6]:
+ code_limit_up_reasons_dict[d[3]] |= set(d[6].split("銆�"))
+ return code_limit_up_reasons_dict
if current_limit_up_datas is None:
current_limit_up_datas = []
@@ -608,7 +651,7 @@
# 濮嬬粓鑾峰彇绮鹃�夋澘鍧�
if True:
# 鑾峰彇
- if k4 and not keys:
+ if k4:
# 褰撴定鍋滃師鍥犳病鏈夋椂鎵嶅彇绮鹃�夋澘鍧�
keys |= k4
keys = keys - constant.KPL_INVALID_BLOCKS
@@ -620,14 +663,16 @@
fresults = []
if not keys:
return fresults, set()
- code_limit_up_reason_dict = {}
+ code_limit_up_reasons_dict = {}
load_code_block()
for block in keys:
can_buy, unique, msg, is_strong = cls.__is_block_can_buy(code, block, current_limit_up_datas,
- code_limit_up_reason_dict,
+ code_limit_up_reasons_dict,
yesterday_current_limit_up_codes,
limit_up_record_datas,
- current_limit_up_block_codes_dict)
+ current_limit_up_block_codes_dict,
+ high_level_code_blocks=high_level_general_code_blocks,
+ high_level_block_codes=high_level_general_block_codes)
fresults.append((block, can_buy, unique, msg, is_strong))
return fresults, keys
@@ -646,10 +691,20 @@
@classmethod
def __compute_can_buy_blocks(cls, code, current_limit_up_datas, limit_up_record_datas,
yesterday_current_limit_up_codes, before_blocks_dict,
- current_limit_up_block_codes_dict):
+ current_limit_up_block_codes_dict, high_level_general_code_blocks):
+ # 鏍规嵁浠ｇ爜娉涘寲鏉垮潡鑾峰彇娉涘寲鏉垮潡鐨勪唬鐮侀泦鍚�
+ high_level_general_block_codes = {}
+ for c in high_level_general_code_blocks:
+ blocks = high_level_general_code_blocks[c]
+ for b in blocks:
+ if b not in high_level_general_block_codes:
+ high_level_general_block_codes[b] = set()
+ high_level_general_block_codes[b].add(c)
blocks_compute_results, keys = cls.get_can_buy_block(code, current_limit_up_datas,
limit_up_record_datas, yesterday_current_limit_up_codes,
- before_blocks_dict, current_limit_up_block_codes_dict)
+ before_blocks_dict, current_limit_up_block_codes_dict,
+ high_level_general_code_blocks,
+ high_level_general_block_codes)
if not blocks_compute_results:
return False, True, f"娌℃湁鎵惧埌鏉垮潡", [], keys
codes_delegate = set(cls.__CodesTradeStateManager.get_codes_by_trade_states_cache(
@@ -723,16 +778,45 @@
return can_buy_blocks, False, ",".join(msg_list), can_buy_strong_blocks, keys
# 鏇存柊浠ｇ爜鏉垮潡鍒ゆ柇鏄惁鍙互涔扮殑缁撴灉
+ # high_level_general_code_blocks 楂樹綅娉涘寲鏉垮潡
@classmethod
def update_can_buy_blocks(cls, code, current_limit_up_datas, limit_up_record_datas,
- yesterday_current_limit_up_codes,
+ latest_current_limit_up_records,
before_blocks_dict, current_limit_up_block_codes_dict):
+ yesterday_current_limit_up_codes = set()
+ yesterday_current_limit_up_records_dict = {}
+ yesterday_current_limit_up_records = latest_current_limit_up_records[0][1]
+ if yesterday_current_limit_up_records:
+ for r in yesterday_current_limit_up_records:
+ yesterday_current_limit_up_codes.add(r[0])
+ yesterday_current_limit_up_records_dict[r[0]] = r
+ high_level_general_code_blocks = {}
+ # 鏄惁鏄�3鏉垮強浠ヤ笂鐨勯珮浣嶆澘
+ for r in current_limit_up_datas:
+ count = kpl_util.get_high_level_count(r[4])
+ if count >= 3 and r[0] in yesterday_current_limit_up_codes:
+ latest_datas = latest_current_limit_up_records[:count - 1]
+ # 鏄珮浣嶆澘
+ # 褰撴棩绮鹃��
+ blocks = set(r[6].split("銆�"))
+ for d in latest_datas:
+ for dd in d[1]:
+ if dd[0] == r[0]:
+ blocks.add(dd[5])
+ break
+ f_blocks = []
+ for b in blocks:
+ if b:
+ f_blocks.append(b)
+ high_level_general_code_blocks[r[0]] = f_blocks
+
can_buy_blocks, unique, msg, can_buy_strong_blocks, keys = cls.__compute_can_buy_blocks(code,
current_limit_up_datas,
limit_up_record_datas,
yesterday_current_limit_up_codes,
before_blocks_dict,
- current_limit_up_block_codes_dict)
+ current_limit_up_block_codes_dict,
+ high_level_general_code_blocks)
# 淇濆瓨鏉垮潡璁＄畻缁撴灉
cls.__can_buy_compute_result_dict[code] = (can_buy_blocks, unique, msg, can_buy_strong_blocks, keys)
--
Gitblit v1.8.0