From 1a9060fd3373df54b6908ad234587f93a62d14fd Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 28 五月 2025 23:28:34 +0800
Subject: [PATCH] bug修复
---
l2_data_parser.py | 20 +++++++-------------
trade/buy_radical/radical_buy_data_manager.py | 1 -
l2_test.py | 2 +-
servers/data_server.py | 12 ++++++++++--
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/l2_data_parser.py b/l2_data_parser.py
index 5433d19..3cab7b0 100644
--- a/l2_data_parser.py
+++ b/l2_data_parser.py
@@ -405,17 +405,11 @@
transaction_big_order_parser.concat_pre_ngtsticks(f"/home/userzjj/ftp/{day}/NGTSTick")
elif _type == 'ExtractDealBigOrder':
# 鍛戒护妯″紡 /home/userzjj/app/gp-server/l2_data_parser ExtractDealBigOrder 2025-05-09
- # 鏍规嵁code鎻愬彇澶у崟
- if not code:
- # indexed_data = [f"/home/userzjj/ftp/{day}/NGTSTick", f"/home/userzjj/ftp/{day}/Transaction"]
- # # 鏂板啓娉�
- # with Pool(processes=2) as pool:
- # pool.map(transaction_big_order_parser.extract_big_order_of_all, indexed_data)
- transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/NGTSTick", process_count=10)
- transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/Transaction", process_count=10)
+ if len(params) > 2:
+ process_count = int(params[2].strip())
else:
- if tool.is_sh_code(code):
- transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/NGTSTick", code)
- else:
- transaction_big_order_parser.extract_big_order_of_code(f"/home/userzjj/ftp/{day}/Transaction", code)
-
+ process_count = 10
+ transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/NGTSTick",
+ process_count=process_count)
+ transaction_big_order_parser.extract_big_order_of_all(f"/home/userzjj/ftp/{day}/Transaction",
+ process_count=process_count)
diff --git a/l2_test.py b/l2_test.py
index 161d834..e11794f 100644
--- a/l2_test.py
+++ b/l2_test.py
@@ -127,7 +127,7 @@
if k_bars and 10e8 <= k_bars[0]["close"] * volume * tool.get_limit_up_rate(code) <= 300e8:
# 鑷敱娴侀�氬競鍊煎湪10浜�-300浜夸互涓�
limit_up_price = round(tool.get_limit_up_rate(code) * k_bars[0]["close"], 2)
- if limit_up_price > k_bars[0]["high"]:
+ if limit_up_price > k_bars[0]["high"] or True:
# 浠婃棩娑ㄥ仠浠疯绐佺牬鏄ㄦ棩鏈�楂樹环
codes.add(code)
# 鑾峰彇杈ㄨ瘑搴︾殑绁�
diff --git a/servers/data_server.py b/servers/data_server.py
index 3c5cc04..a911462 100644
--- a/servers/data_server.py
+++ b/servers/data_server.py
@@ -9,6 +9,7 @@
import requests
import constant
+import inited_data
from code_attribute.gpcode_manager import BlackListCodeManager, HumanRemoveForbiddenManager
from l2.huaxin import huaxin_target_codes_manager
from l2.l2_transaction_data_manager import HuaXinBuyOrderManager
@@ -24,7 +25,7 @@
from trade.buy_radical.new_block_processor import BeforeBlocksComputer
from trade.buy_strategy import OpenLimitUpGoodBlocksBuyStrategy
from trade.buy_radical.radical_buy_data_manager import RadicalBuyBlockManager, BeforeSubDealBigOrderManager
-from utils import global_util, tool, data_export_util
+from utils import global_util, tool, data_export_util, init_data_util
from code_attribute import gpcode_manager, code_nature_analyse
from log_module import log_analyse, log_export, async_log_util
from l2 import code_price_manager, l2_data_util, transaction_progress
@@ -970,6 +971,11 @@
# 鍔犺浇娑ㄥ仠澶у崟璇︽儏
limit_up_big_order_detail = radical_buy_data_manager.get_total_detal_big_order_details(
code)
+ if max(limit_up_big_order_detail) == 0:
+ # 娌℃湁鏁版嵁锛屼粠缃戠粶鍔犺浇
+ limit_up_big_order_detail = list(limit_up_big_order_detail)
+ limit_up_big_order_detail[1] = deal_big_order_detail_info[1][0]
+ limit_up_big_order_detail[3] = deal_big_order_detail_info[2][0]
deal_big_order_info.append(
output_util.money_desc(limit_up_big_order_detail[0] + limit_up_big_order_detail[1]))
deal_big_order_info.append(
@@ -979,6 +985,8 @@
except Exception as e:
logger_debug.error(f"鍙兘娌℃湁鑾峰彇鍒版定鍋滀环锛歿code}")
+ if not gpcode_manager.get_limit_up_price(code):
+ init_data_util.re_set_price_pre(code)
# logger_debug.exception(e)
deal_big_order_info = None
code_name = gpcode_manager.get_code_name(code)
@@ -1060,7 +1068,7 @@
code_info_list.append((d[0], d[6]))
# 淇濆瓨鏂伴鏉�
datas = [(d[0], d[6]) for d in result["list"]]
- async_log_util.info(logger_kpl_new_blocks, f"{(tool.get_thread_id() ,bi, datas)}")
+ async_log_util.info(logger_kpl_new_blocks, f"{(tool.get_thread_id(), bi, datas)}")
if code_info_list:
# 灏嗕唬鐮佸姞鍏ユ柊棰樻潗
new_block_processor.process_new_block_by_component_codes(bi[0],
diff --git a/trade/buy_radical/radical_buy_data_manager.py b/trade/buy_radical/radical_buy_data_manager.py
index 5d96c51..c011a22 100644
--- a/trade/buy_radical/radical_buy_data_manager.py
+++ b/trade/buy_radical/radical_buy_data_manager.py
@@ -2180,7 +2180,6 @@
return datas
return None
-
def list_l2_big_order_deal_info(codes):
"""
鑾峰彇鎴愪氦澶у崟淇℃伅
--
Gitblit v1.8.0