From d99f8a74c3a5e9af6d295cc6ab7d40ed8dce2fe6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 21 十一月 2024 16:30:45 +0800
Subject: [PATCH] 创建客户端日志
---
api/outside_api_command_callback.py | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index 30952dd..d39d432 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -36,8 +36,7 @@
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, RealTimeKplMarketData, \
- RadicalBuyBlockManager
+from third_data.code_plate_key_manager import KPLCodeJXBlockManager
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
@@ -51,6 +50,7 @@
from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
from trade.huaxin.huaxin_trade_record_manager import PositionManager, DealRecordManager, DelegateRecordManager
+from trade.buy_radical.radical_buy_data_manager import RadicalBuyBlockManager
from trade.sell import sell_manager
from trade.sell.sell_rule_manager import TradeRuleManager, SellRule
from trade.trade_manager import TradeTargetCodeModeManager, AutoCancelSellModeManager
@@ -93,7 +93,7 @@
def __cancel_not_deal_order(self, code, order_ref, timeout=3):
time.sleep(timeout)
# 鎾や拱鍗�
- huaxin_trade_api.cancel_order(1, code, "", orderRef=order_ref)
+ huaxin_trade_api.cancel_order(huaxin_trade_api.TRADE_DIRECTION_BUY, code, "", orderRef=order_ref)
# 浜ゆ槗
def OnTrade(self, client_id, request_id, data):
@@ -934,7 +934,7 @@
limit_up_price = gpcode_manager.get_limit_up_price(code)
buy1_money = Buy1PriceManager().get_latest_buy1_money(code)
if buy1_money is None:
- buy1_money = 0
+ buy1_money = 1
# 鑾峰彇宸茬粡鎴愪氦鐨勫ぇ鍗曟暟閲�
total_big_num = 0
total_big_count = 0
@@ -1017,7 +1017,7 @@
real_place_order_after_num += val["num"]
# 鑾峰彇褰撴棩鐨勯噺姣�
- volume_rate = code_volumn_manager.get_volume_rate(code)
+ volume_rate = code_volumn_manager.CodeVolumeManager().get_volume_rate(code)
# 鏄惁闇�瑕佹敞鎰�
need_pay_attention = (total_left_count <= 10 or total_left_num * float(
@@ -1075,7 +1075,7 @@
"pay_attention": need_pay_attention,
"trade_progress_percent": round(
total_left_num * float(limit_up_price) * 100 * 100 / buy1_money, 2), # 鎴愪氦杩涘害姣斾緥
- "limit_up_price": float(gpcode_manager.get_limit_up_price(code)),
+ "limit_up_price": gpcode_manager.get_limit_up_price_as_num(code),
"is_near_big_order": is_near_big_order,
"block": '',
"trade_queue": []
@@ -1210,7 +1210,7 @@
# 鑾峰彇澶у崟鎴愪氦鍒楄〃
code = data["code"]
data_list = BigOrderDealManager().get_total_buy_money_list(code)
- bigger_money = l2_data_util_old.get_big_money_val(float(gpcode_manager.get_limit_up_price(code)),
+ bigger_money = l2_data_util_old.get_big_money_val(gpcode_manager.get_limit_up_price_as_num(code),
tool.is_ge_code(code))
fdatas = []
for d in data_list:
@@ -1287,6 +1287,7 @@
default_buy_money = data["default_buy_money"]
if int(default_buy_money) not in constant.AVAILABLE_BUY_MONEYS:
raise Exception("榛樿閲戦涓嶅湪棰勮閲戦鍐�")
+ constant.BUY_MONEY_PER_CODE = default_buy_money
BuyMoneyAndCountSetting().set_normal_buy_data(normal[0], json.loads(normal[1]))
BuyMoneyAndCountSetting().set_radical_buy_data(radical[0], json.loads(radical[1]))
data = {
@@ -1322,7 +1323,41 @@
self.send_response({"code": 0, "data": data, "msg": f""},
client_id,
request_id)
+ elif ctype == "get_place_order_settings":
+ # 鑾峰彇涔板叆涓嬪崟璁剧疆
+ data = {
+ "radical_buy": {"price": (constant.MIN_CODE_RADICAL_BUY_PRICE, constant.MAX_CODE_RADICAL_BUY_PRICE),
+ "zyltgb": constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES}}
+ self.send_response({"code": 0, "data": data, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "set_place_order_settings":
+ radical_buy = data.get("radical_buy")
+ if radical_buy:
+ radical_buy = json.loads(radical_buy)
+ constant.MIN_CODE_RADICAL_BUY_PRICE = radical_buy["price"][0]
+ constant.MAX_CODE_RADICAL_BUY_PRICE = radical_buy["price"][1]
+ constant.RADICAL_BUY_ZYLTGB_AS_YI_RANGES = radical_buy["zyltgb"]
+ self.send_response({"code": 0, "data": {}, "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "get_buy_open_limit_up_codes":
+ # 鑾峰彇闅斿鍗曟帓1鐨勪唬鐮�
+ codes = gpcode_manager.BuyOpenLimitUpCodeManager().get_codes()
+ if not codes:
+ codes = set()
+ self.send_response({"code": 0, "data": list(codes), "msg": f""},
+ client_id,
+ request_id)
+ elif ctype == "set_buy_open_limit_up_codes":
+ # 璁剧疆闅斿鍗曟帓1鐨勪唬鐮�
+ codes = data.get("codes")
+ codes = json.loads(codes)
+ gpcode_manager.BuyOpenLimitUpCodeManager().set_codes(set(codes))
+ self.send_response({"code": 0, "data": list(codes), "msg": f""},
+ client_id,
+ request_id)
except Exception as e:
logging.exception(e)
logger_debug.exception(e)
--
Gitblit v1.8.0