From 8a9f1fee85bb10e7d3da63d2beb436f65432801c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 13:04:04 +0800
Subject: [PATCH] fix(okxWs): 修复下单日志参数缺失问题
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
index 3b08fde..4bb3ca3 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
import com.xcong.excoin.modules.okxNewPrice.okxpi.MallUtils;
import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
@@ -10,6 +11,7 @@
import org.java_websocket.client.WebSocketClient;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -41,16 +43,21 @@
String connId = MallUtils.getOrderNum(POSITIONSWS_CHANNEL);
JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, option, argsArray);
webSocketClient.send(jsonObject.toJSONString());
-// log.info("发送持仓频道频道:{}", option);
+ log.info("发送持仓频道频道:{}", option);
} catch (Exception e) {
log.error("订阅持仓频道频道构建失败", e);
}
}
+ public static String initAccountName(String accountName, String posSide) {
+ return accountName+"_"+ posSide;
+ }
+
public static void initEvent(JSONObject response, String accountName) {
-// log.info("订阅成功,数据初始化: {}", response.getJSONObject("arg"));
+ log.info("订阅成功,数据初始化: {}", response.getJSONObject("arg"));
JSONObject arg = response.getJSONObject("arg");
- initParam(arg, accountName);
+ initParam(arg, accountName,CoinEnums.POSSIDE_LONG.getCode());
+ initParam(arg, accountName,CoinEnums.POSSIDE_SHORT.getCode());
}
public static void handleEvent(JSONObject response, String accountName) {
@@ -60,9 +67,7 @@
try {
JSONArray dataArray = response.getJSONArray("data");
if (dataArray == null || dataArray.isEmpty()) {
-// log.info("账户持仓频道数据为空,已当前价买入，并且初始化网格");
- JSONObject posData = new JSONObject();
- initParam(posData, accountName);
+ log.info("账户持仓频道数据为空,等待更新");
return;
}
@@ -92,20 +97,19 @@
String settledPnl = posData.getString("settledPnl");
String fee = posData.getString("fee");
String fundingFee = posData.getString("fundingFee");
- log.info(
- "{}: 账户持仓频道-产品类型: {}, 保证金模式: {}, 持仓方向: {}, 持仓数量: {}, 开仓平均价: {}, "
- + "未实现收益: {}, 未实现收益率: {}, 杠杆倍数: {}, 预估强平价: {}, 初始保证金: {}, "
- + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
- + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
- + "最新标记价格: {},累计手续费: {},累计持仓费: {},",
- accountName, instId, mgnMode, posSide, pos, avgPx,
- upl, uplRatio, lever, liqPx, imr,
- mgnRatio, mmr, notionalUsd, ccy,
- last, idxPx, bePx, realizedPnl, settledPnl,
- markPx,fee,fundingFee
- );
-
- initParam(posData, accountName);
+// log.info(
+// "{}: 账户持仓频道-产品类型: {}, 保证金模式: {}, 持仓方向: {}, 持仓数量: {}, 开仓平均价: {}, "
+// + "未实现收益: {}, 未实现收益率: {}, 杠杆倍数: {}, 预估强平价: {}, 初始保证金: {}, "
+// + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
+// + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
+// + "最新标记价格: {},累计手续费: {},累计持仓费: {},",
+// initAccountName(accountName, posSide), instId, mgnMode, posSide, pos, avgPx,
+// upl, uplRatio, lever, liqPx, imr,
+// mgnRatio, mmr, notionalUsd, ccy,
+// last, idxPx, bePx, realizedPnl, settledPnl,
+// markPx,fee,fundingFee
+// );
+ initParam(posData, accountName,posSide);
}
}
} catch (Exception e) {
@@ -113,8 +117,9 @@
}
}
- private static void initParam(JSONObject posData, String accountName) {
- Map<String, BigDecimal> accountMap = getAccountMap(accountName);
+ private static void initParam(JSONObject posData, String accountName,String posSide) {
+ String accountNamePositons = initAccountName(accountName, posSide);
+ Map<String, BigDecimal> accountMap = getAccountMap(accountNamePositons);
WsMapBuild.saveBigDecimalToMap(accountMap, "avgPx", WsMapBuild.parseBigDecimalSafe(posData.getString("avgPx")));
WsMapBuild.saveBigDecimalToMap(accountMap, "pos", WsMapBuild.parseBigDecimalSafe(posData.getString("pos")));
WsMapBuild.saveBigDecimalToMap(accountMap, "upl", WsMapBuild.parseBigDecimalSafe(posData.getString("upl")));
@@ -126,6 +131,11 @@
WsMapBuild.saveBigDecimalToMap(accountMap, "fee", WsMapBuild.parseBigDecimalSafe(posData.getString("fee")));
WsMapBuild.saveBigDecimalToMap(accountMap, "fundingFee", WsMapBuild.parseBigDecimalSafe(posData.getString("fundingFee")));
- WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
+ BigDecimal ordFrozImr = PositionsWs.getAccountMap(accountNamePositons).get("imr");
+ BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()))
+ .divide(new BigDecimal("2"), RoundingMode.DOWN);
+ if (ordFrozImr.compareTo(totalOrderUsdt) <= 0){
+ WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
+ }
}
}
--
Gitblit v1.9.1