From 22a4b43105abe3a7185c8f5ac36c51e30c6bc7aa Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期二, 08 七月 2025 00:41:40 +0800
Subject: [PATCH] bug修复/策略完善
---
api/outside_api_callback.py | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/api/outside_api_callback.py b/api/outside_api_callback.py
index b9a331a..f1ab133 100644
--- a/api/outside_api_callback.py
+++ b/api/outside_api_callback.py
@@ -6,15 +6,27 @@
import constant
from api.outside_api_command_manager import ActionCallback
+from code_attribute import gpcode_manager
from huaxin_client import l1_subscript_codes_manager
from huaxin_client.client_network import SendResponseSkManager
+from log_module import async_log_util
from strategy import strategy_params_settings, env_info, strategy_manager
from strategy.env_info import RealTimeEnvInfo
+from strategy.place_order_queue_manager import PlaceOrderRecordManager
+from strategy.strategy_manager import PlateWhiteListManager
+from strategy.strategy_params_settings import StrategyParamsSettingsManager, StrategyParamsSettings
+from strategy.strategy_variable import StockVariables
from strategy.strategy_variable_factory import DataLoader
from third_data.history_k_data_manager import TradeDateManager
from third_data.kpl_block_manager import KPLCodeJXBlocksManager
from trade import trade_record_log_util
-from utils import socket_util, middle_api_protocol, tool
+from trade.trade_manager import TradeStateManager, DealCodesManager, logger_trade
+from utils import socket_util, middle_api_protocol, tool, huaxin_util
+
+OPERRATE_SET = 1 # 璁剧疆
+OPERRATE_DELETE = 2 # 鍒犻櫎
+OPERRATE_GET = 3 # 鑾峰彇
+OPERRATE_ADD = 4 # 鏂板
class MyAPICallback(ActionCallback):
@@ -50,7 +62,10 @@
@return:
"""
result = strategy_params_settings.StrategyParamsSettingsManager().get_settings().to_json_str()
- return {"code": 0, "data": json.loads(result)}
+ result = json.loads(result)
+ result["trade_state"] = 1 if TradeStateManager().is_can_buy_cache() else 0
+
+ return {"code": 0, "data": result}
def __on_set_settings(self, data):
"""
@@ -58,7 +73,17 @@
@return:
"""
settings = strategy_params_settings.StrategyParamsSettingsManager().get_settings()
+ settings_vars = vars(settings)
for k in data:
+ if k == "trade_state":
+ if data[k]:
+ TradeStateManager().open_buy()
+ else:
+ TradeStateManager().close_buy()
+ continue
+ if k not in settings_vars:
+ # 娌℃湁鍦ㄥ睘鎬ч噷闈�
+ continue
settings.__setattr__(k, data[k])
strategy_params_settings.StrategyParamsSettingsManager().set_settings(settings)
# 鍚屾鍙傛暟璁剧疆
@@ -148,6 +173,20 @@
logging.exception(e)
return {"code": 1, "msg": str(e)}
+ def __on_plate_white_list(self, data):
+ operate = data["operate"]
+ if operate == OPERRATE_GET:
+ plates = PlateWhiteListManager().get_plates()
+ return {"code": 0, "data": list(plates)}
+ elif operate == OPERRATE_ADD:
+ plate = data["plate"]
+ PlateWhiteListManager().add_plate(plate)
+ return {"code": 0}
+ elif operate == OPERRATE_DELETE:
+ plate = data["plate"]
+ PlateWhiteListManager().remove_plate(plate)
+ return {"code": 0}
+
def OnCommonRequest(self, client_id, request_id, data):
ctype = data["ctype"]
result_json = {}
@@ -171,6 +210,86 @@
elif ctype == 'get_place_order_records':
# 鑾峰彇涓嬪崟璁板綍
datas = trade_record_log_util.get_trade_records(trade_record_log_util.TYPE_PLACE_ORDER)
+ for data in datas:
+ data[3]["code_name"] = gpcode_manager.CodesNameManager().get_code_name(data[3]["code"])
result_json = {"code": 0, "data": datas}
+ elif ctype == 'get_can_buy_plates':
+ # 鑾峰彇鍙互涔扮殑鏉垮潡
+ settings: StrategyParamsSettings = StrategyParamsSettingsManager().get_settings()
+ try:
+ current_limit_up_plate_codes = strategy_manager.low_suction_strtegy.current_limit_up_plate_codes
+ plates = [plate for plate, codes in current_limit_up_plate_codes.items() if
+ len(codes) >= settings.limit_up_count_of_new_plate]
+ except:
+ plates = []
+ result_json = {"code": 0, "data": plates}
+ elif ctype == 'plate_white_list':
+ result_json = self.__on_plate_white_list(data)
+ elif ctype == 'get_not_process_place_order_record':
+ # 鑾峰彇鏈鐞嗙殑涓嬪崟璁板綍
+ record = PlaceOrderRecordManager(tool.get_now_date_str()).get_not_process_record()
+ if not record:
+ result_json = {"code": 1, "msg": '鏆傛棤璁板綍'}
+ else:
+ # (ID,浠ｇ爜,鏉垮潡淇℃伅, 澶у崟淇℃伅, 鏃堕棿, 浠锋牸, 娑ㄥ箙)
+ fdata = {
+ "id": record[0],
+ "code": record[1],
+ "name": gpcode_manager.CodesNameManager().get_code_name(record[1]),
+ "platesInfo": {k: [(xx, gpcode_manager.CodesNameManager().get_code_name(xx)) for xx in v] for k, v in
+ record[2].items()},
+ "time_str": record[4],
+ "bigOrderInfo": record[3]
+ }
+ result_json = {"code": 0, "data": fdata}
+ elif ctype == 'set_place_order_buy':
+ id_ = data.get("id")
+ place_order_record_manager = PlaceOrderRecordManager(tool.get_now_date_str())
+ # (ID,浠ｇ爜,鏉垮潡淇℃伅, 澶у崟淇℃伅, 鏃堕棿, 浠锋牸, 娑ㄥ箙)
+ record = place_order_record_manager.get_not_process_record_by_id(id_)
+ if not record:
+ result_json = {"code": 1, "msg": '璁板綍涓嶅瓨鍦�'}
+ else:
+ code = record[1]
+ sv: StockVariables = strategy_manager.low_suction_strtegy.stock_variables_dict.get(code)
+ if sv is None:
+ result_json = {"code": 1, "msg": '浠ｇ爜鍙橀噺瀵硅薄涓嶅瓨鍦�'}
+ else:
+ place_order_record_manager.set_buy(record[0])
+ # 鍙互涓嬪崟
+ # 鍒ゆ柇鏄惁鍙互涔�
+ order_ref = huaxin_util.create_order_ref()
+ price = tool.get_buy_max_price(sv.褰撳墠浠�)
+ volume = 100
+ DealCodesManager().place_order(set(record[2].keys()), record[1], order_ref, price, volume)
+ trade_record_log_util.add_place_order_log(code, trade_record_log_util.PlaceOrderInfo(code=code,
+ time_str=
+ record[4],
+ price=sv.褰撳墠浠�,
+ rate=round((
+ sv.褰撳墠浠� - sv.鏄ㄦ棩鏀剁洏浠�) * 100 / sv.鏄ㄦ棩鏀剁洏浠�,
+ 2),
+ plates=record[
+ 2].keys(),
+ plates_info=
+ record[2],
+ info=record[3]
+ ))
+ async_log_util.info(logger_trade, f"{code}涓嬪崟锛屾澘鍧楋細{record[2].keys()}")
+ result_json = {"code": 0, "msg": '澶勭悊鎴愬姛'}
+ elif ctype == 'set_place_order_not_buy':
+ id_ = data.get("id")
+ place_order_record_manager = PlaceOrderRecordManager(tool.get_now_date_str())
+ # (ID,浠ｇ爜,鏉垮潡淇℃伅, 澶у崟淇℃伅, 鏃堕棿, 浠锋牸, 娑ㄥ箙)
+ record = place_order_record_manager.get_not_process_record_by_id(id_)
+ if not record:
+ result_json = {"code": 1, "msg": '璁板綍涓嶅瓨鍦�'}
+ else:
+ place_order_record_manager.set_not_buy(record[0], "鎵嬪姩椹冲洖")
+ result_json = {"code": 0, "msg": '澶勭悊鎴愬姛'}
+ elif ctype == 'add_black_list':
+ code = data.get("code")
+ gpcode_manager.BlackListCodeManager().add_code(code)
+ result_json = {"code": 0, "msg": '娣诲姞鎴愬姛'}
self.send_response(result_json, client_id, request_id)
--
Gitblit v1.8.0