From f0248f54f90a12f491245f0ee3ccfbe8f477a76b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期五, 22 十二月 2023 14:24:20 +0800
Subject: [PATCH] bug修复
---
code_attribute/first_target_code_data_processor.py | 55 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/code_attribute/first_target_code_data_processor.py b/code_attribute/first_target_code_data_processor.py
index 636c139..f6665dc 100644
--- a/code_attribute/first_target_code_data_processor.py
+++ b/code_attribute/first_target_code_data_processor.py
@@ -5,16 +5,16 @@
# 澶勭悊棣栨澘浠ｇ爜淇℃伅
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 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 utils import global_util, tool, init_data_util
__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
@@ -22,6 +22,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 = []
@@ -43,7 +45,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:
@@ -80,7 +82,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:
@@ -101,7 +103,7 @@
# 鑾峰彇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:
@@ -111,20 +113,35 @@
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])
- if code_nature_analyse.is_up_too_high_in_10d(volumes_data):
+
+ # 淇濆瓨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_with_limit_up(volumes_data):
# 鍒ゆ柇鏄惁澶珮
- l2_trade_util.forbidden_trade(code, "鑲′环闀垮緱澶珮")
+ # l2_trade_util.forbidden_trade(code, "鑲′环闀垮緱澶珮锛�5澶╁唴鏈�3涓定鍋滐級")
+ HighIncreaseCodeManager().add_code(code)
if code_nature_analyse.is_up_too_high_in_120d(volumes_data):
# 鍒ゆ柇鏄惁澶珮
- l2_trade_util.forbidden_trade(code, "120澶╁唴鑲′环闀垮緱澶珮")
+ # l2_trade_util.forbidden_trade(code, "120澶╁唴鑲′环闀垮緱澶珮")
+ # HighIncreaseCodeManager().add_code(code)
+ pass
+
+ if code_nature_analyse.is_price_too_high_in_days(volumes_data, limit_up_price):
+ # 鍒ゆ柇鏄惁澶珮
+ l2_trade_util.forbidden_trade(code, "6澶╁唴鑲′环闀垮緱澶珮")
+ # HighIncreaseCodeManager().add_code(code)
if code_nature_analyse.is_have_latest_max_volume(volumes_data, 2):
# 鏈�杩�2澶╂槸鍚︽槸鏈�楂橀噺
@@ -145,6 +162,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:
@@ -178,7 +196,7 @@
# 鑾峰彇娑ㄥ仠浠�
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)
@@ -204,19 +222,14 @@
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(
{"code": code, "time": limit_up_time, "rate": rate,
"limit_up": is_limit_up})
- if code in new_add_codes:
- if is_limit_up:
- place_order_count = trade_data_manager.PlaceOrderCountManager().get_place_order_count(
- code)
- if place_order_count == 0:
- trade_data_manager.PlaceOrderCountManager().place_order(code)
gpcode_first_screen_manager.process_ticks(prices)
logger_l2_codes_subscript.info(f"({request_id})l2浠ｇ爜鐩稿叧鏁版嵁鍔犺浇瀹屾垚")
return tick_datas
+
--
Gitblit v1.8.0