From b6a39410ab08d347f30134007ee37d0adde84cfe Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 09 四月 2025 10:46:51 +0800
Subject: [PATCH] bug修复
---
code_attribute/first_target_code_data_processor.py | 75 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/code_attribute/first_target_code_data_processor.py b/code_attribute/first_target_code_data_processor.py
index e14eb1a..421e609 100644
--- a/code_attribute/first_target_code_data_processor.py
+++ b/code_attribute/first_target_code_data_processor.py
@@ -11,14 +11,15 @@
from code_attribute.code_nature_analyse import HighIncreaseCodeManager
from code_attribute.gpcode_manager import WantBuyCodesManager
from log_module import async_log_util
-from log_module.log import logger_first_code_record, logger_l2_codes_subscript
+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
+from trade import l2_trade_util
from settings.trade_setting import MarketSituationManager
+from trade.buy_radical import new_block_processor
+from trade.buy_radical.block_special_codes_manager import BlockSpecialCodesManager
from utils import global_util, tool, init_data_util, buy_condition_util
__CodesPlateKeysManager = CodesHisReasonAndBlocksManager()
@@ -43,7 +44,7 @@
def process_first_codes_datas(dataList, request_id=None):
- logger_l2_codes_subscript.info(f"{request_id}鍔犺浇l2浠ｇ爜鐩稿叧鏁版嵁")
+ async_log_util.info(logger_l2_codes_subscript, f"{request_id}鍔犺浇l2浠ｇ爜鐩稿叧鏁版嵁")
# 鑾峰彇鏈�杩�5澶╃殑浜ゆ槗鏃ユ湡锛屼负鍚庨潰鐨勬暟鎹绠楀仛鍑嗗
dates = HistoryKDatasUtils.get_latest_trading_date_cache(5)
latest_trading_date = None
@@ -111,51 +112,45 @@
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,
- volumes_data[
- :90]) or code_nature_analyse.is_near_top(
- code,
- limit_up_price,
- volumes_data[:90]))
+ volumes = init_data_util.parse_max_volume_new(code, volumes_data[:60])
+ max_volume_in_5_days = init_data_util.parse_max_volume_in_days(volumes_data, 5)
+
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])
+ code_volumn_manager.CodeVolumeManager().set_histry_volumn(code, volumes[0], volumes[1], volumes[2],
+ volumes[3], max_volume_in_5_days)
# 淇濆瓨K绾垮舰鎬�
k_format = code_nature_analyse.get_k_format(code, limit_up_price, volumes_data)
code_nature_analyse.CodeNatureRecordManager().save_k_format(code, k_format)
- # 鏄惁鍏锋湁杈ㄨ瘑搴�
- 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]}浜�")
+ if not WantBuyCodesManager().is_in_cache(
+ code) and not gpcode_manager.BuyOpenLimitUpCodeManager().is_in_cache(code):
+ # 鏂伴鏉愮牬鍓嶉珮灏变笉闇�瑕佸姞榛�
+ need_forbidden = new_block_processor.is_can_forbidden(code)
+ if need_forbidden:
+ if code_nature_analyse.is_price_too_high_in_days(code, volumes_data, limit_up_price)[0]:
+ # 鍒ゆ柇鏄惁澶珮
+ l2_trade_util.forbidden_trade(code, "6澶╁唴鑲′环闀垮緱澶珮")
continue
- elif limit_up_price and float(limit_up_price) >= 50:
- l2_trade_util.forbidden_trade(code,
- f"鏃犺鲸璇嗗害锛屾定鍋滀环({limit_up_price})>50")
+
+ if tool.is_ge_code(code) and float(limit_up_price) < 10:
+ l2_trade_util.forbidden_trade(code, "鍒涗笟鏉胯偂浠�10鍧楀唴")
+
+ if len(k_format) > 14 and k_format[14]:
+ l2_trade_util.forbidden_trade(code, "鏄ㄦ棩鐐告澘")
continue
- # 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
- # pass
- if code_nature_analyse.is_continue_limit_up_not_enough_fall_dwon(code, volumes_data):
- # 鍒ゆ柇鏄惁澶珮
- l2_trade_util.forbidden_trade(code, "鍥炶俯涓嶅")
- continue
-
- if not __is_normal_in_5d(code):
- l2_trade_util.forbidden_trade(code, "鏈�杩�5澶╂湁ST/闈炴甯哥姸鎬�")
- continue
+ # if code_nature_analyse.is_continue_limit_up_not_enough_fall_dwon(code, volumes_data):
+ # # 鍒ゆ柇鏄惁澶珮
+ # l2_trade_util.forbidden_trade(code, "鍥炶俯涓嶅")
+ # 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):
# 鍒ゆ柇鏄惁澶珮
--
Gitblit v1.8.0