From 1278ee2bd43b401489b4377b0eee5259b3d5bbbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 13 May 2026 18:17:19 +0800
Subject: [PATCH] refactor(okxNewPrice): 账户配置
---
src/main/java/com/xcong/excoin/modules/okxApi/OkxTradeExecutor.java | 79 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxApi/OkxTradeExecutor.java b/src/main/java/com/xcong/excoin/modules/okxApi/OkxTradeExecutor.java
index 94c162e..d079ac8 100644
--- a/src/main/java/com/xcong/excoin/modules/okxApi/OkxTradeExecutor.java
+++ b/src/main/java/com/xcong/excoin/modules/okxApi/OkxTradeExecutor.java
@@ -8,7 +8,6 @@
import org.java_websocket.client.WebSocketClient;
import java.math.BigDecimal;
-import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
@@ -46,21 +45,20 @@
@Slf4j
public class OkxTradeExecutor {
- private static final String ORDER_TYPE_CLOSE_LONG = "plan-close-long-position";
- private static final String ORDER_TYPE_CLOSE_SHORT = "plan-close-short-position";
-
private final String contract;
private final String marginMode;
private final String accountName;
+ private final String instIdCode;
private volatile WebSocketClient wsClient;
private final ExecutorService executor;
- public OkxTradeExecutor(String contract, String marginMode, String accountName) {
+ public OkxTradeExecutor(String contract, String marginMode, String accountName, String instIdCode) {
this.contract = contract;
this.marginMode = marginMode;
this.accountName = accountName;
+ this.instIdCode = instIdCode;
this.executor = new ThreadPoolExecutor(
1, 1,
60L, TimeUnit.SECONDS,
@@ -152,21 +150,42 @@
executor.execute(() -> {
String posSide;
String side;
- if (ORDER_TYPE_CLOSE_LONG.equals(orderType)) {
+ if (OkxEnums.ORDER_TYPE_CLOSE_LONG.equals(orderType)) {
posSide = OkxEnums.POSSIDE_LONG;
side = OkxEnums.SIDE_SELL;
- } else {
+ } else if (OkxEnums.ORDER_TYPE_CLOSE_SHORT.equals(orderType)) {
posSide = OkxEnums.POSSIDE_SHORT;
side = OkxEnums.SIDE_BUY;
+ } else {
+ log.error("[TradeExec] 未知止盈类型: {}", orderType);
+ return;
}
try {
- TradeRequestParam param = buildParam(side, posSide, size, OkxEnums.ORDTYPE_LIMIT);
- param.setMarkPx(triggerPrice.toString());
+ if (wsClient == null || !wsClient.isOpen()) {
+ log.warn("[TradeExec] WS未连接，跳过止盈单");
+ return;
+ }
+ if (BigDecimal.ZERO.compareTo(new BigDecimal(size)) >= 0) {
+ log.warn("[TradeExec] 止盈数量<=0，跳过");
+ return;
+ }
- List<TradeRequestParam> params = new ArrayList<>();
- params.add(param);
- sendBatchOrders(params);
+ JSONArray argsArray = new JSONArray();
+ JSONObject args = new JSONObject();
+ args.put("instIdCode", instIdCode);
+ args.put("tdMode", marginMode);
+ args.put("side", side);
+ args.put("posSide", posSide);
+ args.put("ordType", OkxEnums.ORDTYPE_CONDITIONAL);
+ args.put("sz", size);
+ args.put("tpTriggerPx", triggerPrice.toString());
+ args.put("tpOrdPx", "-1");
+ argsArray.add(args);
+
+ String connId = OkxWsUtil.getOrderNum("algo");
+ JSONObject msg = OkxWsUtil.buildJsonObject(connId, "order-algo", argsArray);
+ wsClient.send(msg.toJSONString());
log.info("[TradeExec] 止盈单已发送, 触发价:{}, 类型:{}, size:{}", triggerPrice, orderType, size);
} catch (Exception e) {
log.error("[TradeExec] 止盈单发送失败, 触发价:{}, size:{}, 立即市价止盈", triggerPrice, size, e);
@@ -201,7 +220,7 @@
}
JSONArray argsArray = new JSONArray();
JSONObject args = new JSONObject();
- args.put("instId", contract);
+ args.put("instIdCode", instIdCode);
args.put("algoOrdType", "conditional");
argsArray.add(args);
@@ -229,6 +248,18 @@
return param;
}
+ private JSONObject buildOrderArgs(TradeRequestParam param) {
+ JSONObject args = new JSONObject();
+ args.put("instIdCode", instIdCode);
+ args.put("tdMode", param.getTdMode());
+ args.put("clOrdId", param.getClOrdId());
+ args.put("side", param.getSide());
+ args.put("posSide", param.getPosSide());
+ args.put("ordType", param.getOrdType());
+ args.put("sz", param.getSz());
+ return args;
+ }
+
private void sendOrder(TradeRequestParam param) {
if (wsClient == null || !wsClient.isOpen()) {
log.warn("[TradeExec] WS未连接，跳过下单");
@@ -240,20 +271,11 @@
}
JSONArray argsArray = new JSONArray();
- JSONObject args = new JSONObject();
- args.put("instId", param.getInstId());
- args.put("tdMode", param.getTdMode());
- args.put("clOrdId", param.getClOrdId());
- args.put("side", param.getSide());
- args.put("posSide", param.getPosSide());
- args.put("ordType", param.getOrdType());
- args.put("sz", param.getSz());
- argsArray.add(args);
+ argsArray.add(buildOrderArgs(param));
String connId = OkxWsUtil.getOrderNum("order");
JSONObject msg = OkxWsUtil.buildJsonObject(connId, "order", argsArray);
wsClient.send(msg.toJSONString());
- log.info("[TradeExec] 发送下单: side={}, sz={}", param.getSide(), param.getSz());
}
private void sendBatchOrders(List<TradeRequestParam> params) {
@@ -264,16 +286,7 @@
JSONArray argsArray = new JSONArray();
for (TradeRequestParam p : params) {
- JSONObject args = new JSONObject();
- args.put("instId", p.getInstId());
- args.put("tdMode", p.getTdMode());
- args.put("clOrdId", p.getClOrdId());
- args.put("side", p.getSide());
- args.put("posSide", p.getPosSide());
- args.put("ordType", p.getOrdType());
- args.put("sz", p.getSz());
- args.put("px", p.getMarkPx());
- argsArray.add(args);
+ argsArray.add(buildOrderArgs(p));
}
String connId = OkxWsUtil.getOrderNum(null);
--
Gitblit v1.9.1