From f327048f2097293ed1e4f484bab1de04901074dc Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 18 十月 2024 18:19:53 +0800
Subject: [PATCH] bug修改
---
code_attribute/first_target_code_data_processor.py | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/code_attribute/first_target_code_data_processor.py b/code_attribute/first_target_code_data_processor.py
index 01da882..436ba26 100644
--- a/code_attribute/first_target_code_data_processor.py
+++ b/code_attribute/first_target_code_data_processor.py
@@ -10,8 +10,11 @@
from code_attribute.code_data_util import ZYLTGBUtil
from code_attribute.code_nature_analyse import HighIncreaseCodeManager
from code_attribute.gpcode_manager import WantBuyCodesManager
-from log_module.log import logger_first_code_record, logger_l2_codes_subscript
+from log_module import async_log_util
+from log_module.log import logger_first_code_record, logger_l2_codes_subscript, logger_debug
+from third_data import history_k_data_manager
from third_data.code_plate_key_manager import CodesHisReasonAndBlocksManager
+from third_data.history_k_data_manager import HistoryKDataManager
from third_data.history_k_data_util import HistoryKDatasUtils, JueJinApi
from ths import l2_code_operate
from trade import trade_data_manager, l2_trade_util
@@ -41,9 +44,12 @@
def process_first_codes_datas(dataList, request_id=None):
logger_l2_codes_subscript.info(f"{request_id}鍔犺浇l2浠ｇ爜鐩稿叧鏁版嵁")
- print("棣栨澘浠ｇ爜鏁伴噺锛�", len(dataList))
# 鑾峰彇鏈�杩�5澶╃殑浜ゆ槗鏃ユ湡锛屼负鍚庨潰鐨勬暟鎹绠楀仛鍑嗗
- HistoryKDatasUtils.get_latest_trading_date_cache(5)
+ dates = HistoryKDatasUtils.get_latest_trading_date_cache(5)
+ latest_trading_date = None
+ if dates:
+ latest_trading_date = dates[0]
+
limit_up_price_dict = {}
temp_codes = []
codes = []
@@ -64,7 +70,7 @@
# 鑾峰彇娑ㄥ仠浠�
_limit_up_price = gpcode_manager.get_limit_up_price(code)
if not _limit_up_price:
- init_data_util.re_set_price_pres([code], True)
+ history_k_data_manager.re_set_price_pres([code], True)
# 鍐嶆鑾峰彇娑ㄥ仠浠�
_limit_up_price = gpcode_manager.get_limit_up_price(code)
if _limit_up_price:
@@ -80,7 +86,7 @@
if gpcode_manager.get_limit_up_price(code) is None:
need_get_limit_up_codes.add(code)
if need_get_limit_up_codes:
- init_data_util.re_set_price_pres(list(need_get_limit_up_codes), True)
+ history_k_data_manager.re_set_price_pres(list(need_get_limit_up_codes), True)
logger_l2_codes_subscript.info(f"{request_id}鍔犺浇l2浠ｇ爜娑ㄥ仠浠风粨鏉�")
# 鑾峰彇60澶╂渶澶ц褰�
for code in codes:
@@ -96,7 +102,15 @@
if limit_up_price is None:
continue
try:
- volumes_data = init_data_util.get_volumns_by_code(code, 150)
+ # 棣栧厛浠庣紦瀛橀噷闈㈣幏鍙�
+ volumes_data = None
+ if latest_trading_date:
+ volumes_data = HistoryKDataManager().get_history_bars(code, latest_trading_date)
+ if not volumes_data:
+ volumes_data = init_data_util.get_volumns_by_code(code, 150)
+ async_log_util.info(logger_l2_codes_subscript, f"{request_id}浠庣綉缁滃姞杞終绾挎暟鎹細{code}")
+ if not volumes_data:
+ continue
volumes = init_data_util.parse_max_volume(code, volumes_data[:90],
code_nature_analyse.is_new_top(code,
limit_up_price,
@@ -105,7 +119,7 @@
code,
limit_up_price,
volumes_data[:90]))
- logger_first_code_record.info("{} 鑾峰彇鍒伴鏉�60澶╂渶澶ч噺锛歿}", code, volumes)
+ async_log_util.info(logger_first_code_record, f"{code} 鑾峰彇鍒伴鏉�60澶╂渶澶ч噺锛歿volumes}")
code_volumn_manager.set_histry_volumn(code, volumes[0], volumes[1], volumes[2], volumes[3])
# 淇濆瓨K绾垮舰鎬�
@@ -123,11 +137,12 @@
l2_trade_util.forbidden_trade(code,
f"鏃犺鲸璇嗗害锛岃嚜鐢辨祦閫氬競鍊�({global_util.zyltgb_map.get(code) // 100000000})>{zylt_threshold_as_yi[1]}浜�")
continue
- elif limit_up_price and float(limit_up_price) >= 50:
+ elif limit_up_price and float(limit_up_price) >= constant.MAX_CODE_PRICE:
l2_trade_util.forbidden_trade(code,
- f"鏃犺鲸璇嗗害锛屾定鍋滀环({limit_up_price})>50")
+ f"鏃犺鲸璇嗗害锛屾定鍋滀环({limit_up_price})>{constant.MAX_CODE_PRICE}")
continue
- if code_nature_analyse.is_price_too_high_in_days(code, volumes_data, limit_up_price)[0] and code.find("30")!=0:
+ if code_nature_analyse.is_price_too_high_in_days(code, volumes_data, limit_up_price)[
+ 0] and code.find("30") != 0:
# 鍒ゆ柇鏄惁澶珮
l2_trade_util.forbidden_trade(code, "6澶╁唴鑲′环闀垮緱澶珮")
continue
@@ -137,10 +152,13 @@
# 鍒ゆ柇鏄惁澶珮
l2_trade_util.forbidden_trade(code, "鍥炶俯涓嶅")
continue
-
- if not __is_normal_in_5d(code):
- l2_trade_util.forbidden_trade(code, "鏈�杩�5澶╂湁ST/闈炴甯哥姸鎬�")
- continue
+ try:
+ if not __is_normal_in_5d(code):
+ l2_trade_util.forbidden_trade(code, "鏈�杩�5澶╂湁ST/闈炴甯哥姸鎬�")
+ continue
+ except Exception as e:
+ logger_debug.error(f"{code}鍑洪敊__is_normal_in_5d")
+ logger_debug.exception(e)
if code_nature_analyse.is_up_too_high_in_10d_with_limit_up(code, volumes_data):
# 鍒ゆ柇鏄惁澶珮
@@ -170,10 +188,10 @@
# gpcode_manager.get_limit_up_price(code),
# volumes_data)
except Exception as e:
- logger_first_code_record.error(f"{code}:{str(e)}")
+ logger_first_code_record.error(f"{request_id}-{code}:{str(e)}")
logger_first_code_record.exception(e)
- logger_l2_codes_subscript.info(f"{request_id}鍔犺浇l2浠ｇ爜K绾跨粨鏉�")
+ async_log_util.info(logger_l2_codes_subscript, f"{request_id}鍔犺浇l2浠ｇ爜K绾跨粨鏉�")
gpcode_manager.FirstCodeManager().add_record(codes)
# 鍒濆鍖栨澘鍧椾俊鎭紝鏆傛椂鍒犻櫎
@@ -215,7 +233,7 @@
# 鑾峰彇娑ㄥ仠浠�
if temp_codes:
# 鑾峰彇娑ㄥ仠浠�
- init_data_util.re_set_price_pres(temp_codes)
+ history_k_data_manager.re_set_price_pres(temp_codes)
# 閲嶆柊鑾峰彇娑ㄥ仠浠�
for code in temp_codes:
limit_up_price = gpcode_manager.get_limit_up_price(code)
@@ -236,12 +254,9 @@
# 绾犳鏁版嵁
if is_limit_up and limit_up_time is None:
limit_up_time = tool.get_now_time_str()
- if is_limit_up:
- # 鍔犲叆棣栨澘娑ㄥ仠
- gpcode_manager.FirstCodeManager().add_limited_up_record([code])
pricePre = gpcode_manager.CodePrePriceManager.get_price_pre_cache(code)
if pricePre is None:
- init_data_util.re_set_price_pres([code])
+ history_k_data_manager.re_set_price_pres([code])
rate = round((float(price) - pricePre) * 100 / pricePre, 1)
prices.append(
@@ -249,5 +264,5 @@
"limit_up": is_limit_up})
gpcode_first_screen_manager.process_ticks(prices)
- logger_l2_codes_subscript.info(f"({request_id})l2浠ｇ爜鐩稿叧鏁版嵁鍔犺浇瀹屾垚")
+ async_log_util.info(logger_l2_codes_subscript, f"({request_id})l2浠ｇ爜鐩稿叧鏁版嵁鍔犺浇瀹屾垚")
return tick_datas
--
Gitblit v1.8.0