From b30e191d0347fc0dc61b48a0cd2b5d368ba8e95b Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 09 十月 2024 14:20:20 +0800
Subject: [PATCH] 去掉6天内股价长得太高
---
api/outside_api_command_callback.py | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 59c9995..4c11619 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -35,7 +35,8 @@
logger_real_place_order_position, logger_device
from output import l2_output_util
from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
-from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager
+from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, RealTimeKplMarketData, \
+ RadicalBuyBlockManager
from third_data.history_k_data_manager import HistoryKDataManager
from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
from third_data.kpl_data_manager import KPLDataManager
@@ -44,6 +45,7 @@
from third_data.third_blocks_manager import CodeThirdBlocksManager, SOURCE_TYPE_KPL, BlockMapManager
from trade import trade_manager, l2_trade_util, trade_data_manager, trade_constant
import l2_data_util as l2_data_util_old
+from trade.buy_money_count_setting import BuyMoneyAndCountSetting
from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
@@ -283,6 +285,8 @@
if code_list_type == outside_api_command_manager.CODE_LIST_WANT:
if operate == outside_api_command_manager.OPERRATE_SET:
gpcode_manager.WantBuyCodesManager().add_code(code)
+ # 鍔犳兂涔板崟瑕佷粠榛戝悕鍗曠Щ闄�
+ l2_trade_util.remove_from_forbidden_trade_codes(code)
name = gpcode_manager.get_code_name(code)
if not name:
results = HistoryKDatasUtils.get_gp_codes_names([code])
@@ -1229,18 +1233,19 @@
source_origin_dict = copy.deepcopy(CodeThirdBlocksManager().get_source_blocks_origin(code))
if not source_origin_dict:
source_origin_dict = {}
- kpl_blocks = KPLCodeJXBlockManager().get_jx_blocks_radical(code)
+ kpl_blocks = RadicalBuyBlockManager.get_code_kpl_blocks(code)
if kpl_blocks is None:
kpl_blocks = set()
if not kpl_blocks:
KPLCodeJXBlockManager().load_jx_blocks_radical(code)
- match_blocks, info = CodeThirdBlocksManager().get_intersection_blocks_info(code, kpl_blocks)
+
+ filter_blocks, match_blocks = RadicalBuyBlockManager.get_code_blocks(code)
source_origin_dict[SOURCE_TYPE_KPL] = kpl_blocks
source_dict[SOURCE_TYPE_KPL] = BlockMapManager().filter_blocks(kpl_blocks)
data = {
"blocks": {},
"origin_blocks": {},
- "match_blocks": list(match_blocks)
+ "match_blocks": [list(filter_blocks), list(match_blocks)]
}
for s in source_origin_dict:
data["origin_blocks"][s] = list(source_origin_dict[s])
@@ -1250,6 +1255,29 @@
self.send_response({"code": 0, "data": data, "msg": f""},
client_id,
request_id)
+ elif ctype == "set_buy_money_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ normal = data["normal"]
+ radical = data["radical"]
+ BuyMoneyAndCountSetting().set_normal_buy_data(normal[0], json.loads(normal[1]))
+ BuyMoneyAndCountSetting().set_radical_buy_data(radical[0], json.loads(radical[1]))
+ data = {
+ "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting()
+ }
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "get_buy_money_count_setting":
+ # 璁剧疆涔板叆閲戦鍜屾暟閲�
+ data = {
+ "normal": BuyMoneyAndCountSetting().get_normal_buy_setting(),
+ "radical": BuyMoneyAndCountSetting().get_radical_buy_setting(),
+ "moneys":constant.AVAILABLE_BUY_MONEYS
+ }
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
except Exception as e:
logging.exception(e)
logger_debug.exception(e)
--
Gitblit v1.8.0