From 9c04f11f32c742663b68a531df6a69bff05fe9a4 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期一, 18 三月 2024 10:05:14 +0800
Subject: [PATCH] bug修改
---
code_attribute/first_target_code_data_processor.py | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 26 deletions(-)
diff --git a/code_attribute/first_target_code_data_processor.py b/code_attribute/first_target_code_data_processor.py
index 79b4ff8..93e2531 100644
--- a/code_attribute/first_target_code_data_processor.py
+++ b/code_attribute/first_target_code_data_processor.py
@@ -5,17 +5,18 @@
# 澶勭悊棣栨澘浠ｇ爜淇℃伅
import constant
-import inited_data
from code_attribute import gpcode_manager, gpcode_first_screen_manager, code_nature_analyse, \
code_volumn_manager
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 third_data.code_plate_key_manager import CodesHisReasonAndBlocksManager
from third_data.history_k_data_util import HistoryKDatasUtils
from ths import l2_code_operate
from trade import trade_data_manager, l2_trade_util
-from utils import global_util, tool
+from trade.trade_manager import MarketSituationManager
+from utils import global_util, tool, init_data_util, buy_condition_util
__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
@@ -23,6 +24,8 @@
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)
limit_up_price_dict = {}
temp_codes = []
codes = []
@@ -44,7 +47,7 @@
# 鑾峰彇娑ㄥ仠浠�
_limit_up_price = gpcode_manager.get_limit_up_price(code)
if not _limit_up_price:
- inited_data.re_set_price_pres([code], True)
+ init_data_util.re_set_price_pres([code], True)
# 鍐嶆鑾峰彇娑ㄥ仠浠�
_limit_up_price = gpcode_manager.get_limit_up_price(code)
if _limit_up_price:
@@ -81,7 +84,7 @@
for code in codes:
# 濡傛灉娑ㄥ仠浠锋槸绌哄�煎氨闇�瑕佽缃槰鏃ユ敹鐩樹环鏍�
if gpcode_manager.get_limit_up_price(code) is None:
- inited_data.re_set_price_pres([code], True)
+ init_data_util.re_set_price_pres([code], True)
# 鏉垮潡鍏抽敭瀛楀噯澶� 鏆傛椂鍒犻櫎
# for code in codes:
@@ -102,7 +105,8 @@
# 鑾峰彇60澶╂渶澶ц褰�
for code in codes:
need_get_volumn = False
- if code not in global_util.max60_volumn or global_util.max60_volumn.get(code) is None:
+ if code not in global_util.max60_volumn or global_util.max60_volumn.get(
+ code) is None or code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code) is None:
need_get_volumn = True
# if not need_get_volumn and code_nature_analyse.CodeNatureRecordManager.get_nature_cache(
# code) is None:
@@ -112,27 +116,55 @@
if limit_up_price is None:
continue
try:
- volumes_data = inited_data.get_volumns_by_code(code, 150)
- volumes = inited_data.parse_max_volume(volumes_data[:90],
- code_nature_analyse.is_new_top(
- limit_up_price,
- volumes_data[:90]))
+ volumes_data = init_data_util.get_volumns_by_code(code, 150)
+ volumes = init_data_util.parse_max_volume(volumes_data[:90],
+ code_nature_analyse.is_new_top(
+ limit_up_price,
+ volumes_data[:90]) or code_nature_analyse.is_near_top(
+ limit_up_price,
+ volumes_data[:90]))
logger_first_code_record.info("{} 鑾峰彇鍒伴鏉�60澶╂渶澶ч噺锛歿}", code, volumes)
- code_volumn_manager.set_histry_volumn(code, volumes[0], volumes[1], volumes[2])
+ code_volumn_manager.set_histry_volumn(code, volumes[0], volumes[1], volumes[2], volumes[3])
# 淇濆瓨K绾垮舰鎬�
k_format = code_nature_analyse.get_k_format(limit_up_price, volumes_data)
code_nature_analyse.CodeNatureRecordManager().save_k_format(code, k_format)
- if code_nature_analyse.is_up_too_high_in_10d(volumes_data):
+ # 鏄惁鍏锋湁杈ㄨ瘑搴�
+ is_special = True if k_format and k_format[8][0] else False
+ if not WantBuyCodesManager().is_in_cache(code):
+ if not is_special:
+ situation = MarketSituationManager().get_situation_cache()
+ zylt_threshold_as_yi = buy_condition_util.get_zyltgb_threshold(situation)
+ if global_util.zyltgb_map.get(code) and global_util.zyltgb_map.get(code) > zylt_threshold_as_yi[
+ 1] * 100000000:
+ 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:
+ l2_trade_util.forbidden_trade(code,
+ f"鏃犺鲸璇嗗害锛屾定鍋滀环({limit_up_price})>50")
+ continue
+ if code_nature_analyse.is_price_too_high_in_days(volumes_data, limit_up_price)[0]:
+ # 鍒ゆ柇鏄惁澶珮
+ l2_trade_util.forbidden_trade(code, "6澶╁唴鑲′环闀垮緱澶珮")
+ continue
+ pass
+
+ if code_nature_analyse.is_continue_limit_up_not_enough_fall_dwon(volumes_data):
+ # 鍒ゆ柇鏄惁澶珮
+ l2_trade_util.forbidden_trade(code, "鍥炶俯涓嶅")
+ continue
+
+ if code_nature_analyse.is_up_too_high_in_10d_with_limit_up(volumes_data):
# 鍒ゆ柇鏄惁澶珮
- l2_trade_util.forbidden_trade(code, "鑲′环闀垮緱澶珮")
HighIncreaseCodeManager().add_code(code)
if code_nature_analyse.is_up_too_high_in_120d(volumes_data):
# 鍒ゆ柇鏄惁澶珮
- l2_trade_util.forbidden_trade(code, "120澶╁唴鑲′环闀垮緱澶珮")
- HighIncreaseCodeManager().add_code(code)
+ # l2_trade_util.forbidden_trade(code, "120澶╁唴鑲′环闀垮緱澶珮")
+ # HighIncreaseCodeManager().add_code(code)
+ pass
if code_nature_analyse.is_have_latest_max_volume(volumes_data, 2):
# 鏈�杩�2澶╂槸鍚︽槸鏈�楂橀噺
@@ -153,6 +185,7 @@
# volumes_data)
except Exception as e:
logger_first_code_record.error(f"{code}:{str(e)}")
+ logger_first_code_record.exception(e)
gpcode_manager.FirstCodeManager().add_record(codes)
# 鍒濆鍖栨澘鍧椾俊鎭紝鏆傛椂鍒犻櫎
# for code in codes:
@@ -173,6 +206,9 @@
l2_code_operate.L2CodeOperate.get_instance().add_operate(0, lc, "浠ｇ爜琚Щ闄�")
# 淇濆瓨鐜颁环
if dataList:
+ situation = MarketSituationManager().get_situation_cache()
+ zyltgb_thresholds = buy_condition_util.get_zyltgb_threshold(situation)
+ want_codes = gpcode_manager.WantBuyCodesManager().list_code_cache()
for data in dataList:
code = data["code"]
codes.append(code)
@@ -181,12 +217,30 @@
limit_up_price_dict[code] = limit_up_price
else:
temp_codes.append(code)
+ # 鑷敱娴侀�氬競鍊间笉绗﹀悎鏍囧噯
+ if not want_codes or code not in want_codes:
+ # 娌″湪鎯充拱鍗�
+ zyltgb = global_util.zyltgb_map.get(code)
+ if zyltgb:
+ zyltgb_as_yi = round(zyltgb / 100000000, 2)
+ if zyltgb_as_yi < zyltgb_thresholds[0] or zyltgb_as_yi > zyltgb_thresholds[6]:
+ # 鎯充拱鍗曚腑鐨勪笉鑳芥帓闄�
+ continue
+ elif zyltgb_as_yi > zyltgb_thresholds[1]:
+ # 姣旀渶澶у彲涔板ぇ鐨勶紝濡傛灉娌℃湁鐭湡杈ㄨ瘑搴﹀氨涓嶄拱
+ k_format = code_nature_analyse.CodeNatureRecordManager().get_k_format_cache(code)
+ if k_format and k_format[8][0] and k_format[8][1].find("鐭湡") >= 0:
+ pass
+ else:
+ # 鏃犵煭鏈熻鲸璇嗗害
+ continue
+
tick_datas.append({"code": code, "price": data["price"], "volume": data["volume"],
"volumeUnit": data["volumeUnit"]})
# 鑾峰彇娑ㄥ仠浠�
if temp_codes:
# 鑾峰彇娑ㄥ仠浠�
- inited_data.re_set_price_pres(temp_codes)
+ init_data_util.re_set_price_pres(temp_codes)
# 閲嶆柊鑾峰彇娑ㄥ仠浠�
for code in temp_codes:
limit_up_price = gpcode_manager.get_limit_up_price(code)
@@ -212,7 +266,7 @@
gpcode_manager.FirstCodeManager().add_limited_up_record([code])
pricePre = gpcode_manager.CodePrePriceManager.get_price_pre_cache(code)
if pricePre is None:
- inited_data.re_set_price_pres([code])
+ init_data_util.re_set_price_pres([code])
rate = round((float(price) - pricePre) * 100 / pricePre, 1)
prices.append(
@@ -222,12 +276,3 @@
gpcode_first_screen_manager.process_ticks(prices)
logger_l2_codes_subscript.info(f"({request_id})l2浠ｇ爜鐩稿叧鏁版嵁鍔犺浇瀹屾垚")
return tick_datas
-
-
-if __name__ == "__main__":
- code = "002308"
- limit_up_price = gpcode_manager.get_limit_up_price(code)
- volumes_data = inited_data.get_volumns_by_code(code, 150)
- # 淇濆瓨K绾垮舰鎬�
- k_format = code_nature_analyse.get_k_format(limit_up_price, volumes_data)
- code_nature_analyse.CodeNatureRecordManager().save_k_format(code, k_format)
\ No newline at end of file
--
Gitblit v1.8.0