From bede2aecbc1f3ce5d607081eec64d4cb2ab31b03 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 16:29:44 +0800
Subject: [PATCH] feat(okxWs): 添加账户和持仓WebSocket更新间隔配置
---
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java | 90 ++++++++++++++++++++++++--------------------
1 files changed, 49 insertions(+), 41 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 1153973..be35f0e 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
@@ -32,6 +32,9 @@
args.put("channel", POSITIONSWS_CHANNEL);
args.put("instType", CoinEnums.INSTTYPE_SWAP.getCode());
args.put("instId", CoinEnums.HE_YUE.getCode());
+ JSONObject updateInterval = new JSONObject();
+ updateInterval.put("updateInterval",CoinEnums.UPDATEINTERVAL.getCode());
+ args.put("extraParams", updateInterval);
argsArray.add(args);
String connId = MallUtils.getOrderNum(POSITIONSWS_CHANNEL);
@@ -44,53 +47,56 @@
}
public static void handleEvent(JSONObject response, RedisUtils redisUtils) {
+
+
+ log.info("开始执行PositionsWs......");
try {
JSONArray dataArray = response.getJSONArray("data");
if (dataArray == null || dataArray.isEmpty()) {
log.info("账户持仓频道数据为空,已当前价买入，并且初始化网格");
+ JSONObject posData = new JSONObject();
+ processPositionData(posData, redisUtils);
return;
}
for (int i = 0; i < dataArray.size(); i++) {
JSONObject posData = dataArray.getJSONObject(i);
String instId = posData.getString("instId");
-
- if (!CoinEnums.HE_YUE.getCode().equals(instId)) {
- continue;
+ if (CoinEnums.HE_YUE.getCode().equals(instId)) {
+ log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
+ String mgnMode = posData.getString("mgnMode");
+ String posSide = posData.getString("posSide");
+ String pos = posData.getString("pos");
+ String avgPx = posData.getString("avgPx");
+ String upl = posData.getString("upl");
+ String uplRatio = posData.getString("uplRatio");
+ String lever = posData.getString("lever");
+ String liqPx = posData.getString("liqPx");
+ String markPx = posData.getString("markPx");
+ String imr = posData.getString("imr");
+ String mgnRatio = posData.getString("mgnRatio");
+ String mmr = posData.getString("mmr");
+ String notionalUsd = posData.getString("notionalUsd");
+ String ccy = posData.getString("ccy");
+ String last = posData.getString("last");
+ String idxPx = posData.getString("idxPx");
+ String bePx = posData.getString("bePx");
+ String realizedPnl = posData.getString("realizedPnl");
+ String settledPnl = posData.getString("settledPnl");
+ log.info(
+ "账户持仓频道-产品类型: {}, 保证金模式: {}, 持仓方向: {}, 持仓数量: {}, 开仓平均价: {}, "
+ + "未实现收益: {}, 未实现收益率: {}, 杠杆倍数: {}, 预估强平价: {}, 初始保证金: {}, "
+ + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
+ + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
+ + "最新标记价格: {}",
+ instId, mgnMode, posSide, pos, avgPx,
+ upl, uplRatio, lever, liqPx, imr,
+ mgnRatio, mmr, notionalUsd, ccy,
+ last, idxPx, bePx, realizedPnl, settledPnl,
+ markPx
+ );
+ processPositionData(posData, redisUtils);
}
- String mgnMode = posData.getString("mgnMode");
- String posSide = posData.getString("posSide");
- String pos = posData.getString("pos");
- String avgPx = posData.getString("avgPx");
- String upl = posData.getString("upl");
- String uplRatio = posData.getString("uplRatio");
- String lever = posData.getString("lever");
- String liqPx = posData.getString("liqPx");
- String markPx = posData.getString("markPx");
- String imr = posData.getString("imr");
- String mgnRatio = posData.getString("mgnRatio");
- String mmr = posData.getString("mmr");
- String notionalUsd = posData.getString("notionalUsd");
- String ccy = posData.getString("ccy");
- String last = posData.getString("last");
- String idxPx = posData.getString("idxPx");
- String bePx = posData.getString("bePx");
- String realizedPnl = posData.getString("realizedPnl");
- String settledPnl = posData.getString("settledPnl");
- log.info(
- "账户持仓频道-产品类型: {}, 保证金模式: {}, 持仓方向: {}, 持仓数量: {}, 开仓平均价: {}, "
- + "未实现收益: {}, 未实现收益率: {}, 杠杆倍数: {}, 预估强平价: {}, 初始保证金: {}, "
- + "维持保证金率: {}, 维持保证金: {}, 以美金价值为单位的持仓数量: {}, 占用保证金的币种: {}, "
- + "最新成交价: {}, 最新指数价格: {}, 盈亏平衡价: {}, 已实现收益: {}, 累计已结算收益: {}"
- + "最新标记价格: {}",
- instId, mgnMode, posSide, pos, avgPx,
- upl, uplRatio, lever, liqPx, imr,
- mgnRatio, mmr, notionalUsd, ccy,
- last, idxPx, bePx, realizedPnl, settledPnl,
- markPx
- );
-
- processPositionData(posData, redisUtils);
}
} catch (Exception e) {
log.error("处理持仓频道推送数据失败", e);
@@ -106,8 +112,9 @@
String mgnRatio = safeGetString(posData, "mgnRatio");
String markPx = safeGetString(posData, "markPx");
String bePx = safeGetString(posData, "bePx");
+ String realizedPnl = safeGetString(posData, "realizedPnl");
- boolean setResult = saveToRedis(redisUtils, avgPx, pos, upl, imr, mgnRatio, markPx, bePx);
+ boolean setResult = saveToRedis(redisUtils, avgPx, pos, upl, imr, mgnRatio, markPx, bePx,realizedPnl);
if (setResult) {
calculateAndSaveBuyCount(redisUtils);
@@ -121,14 +128,15 @@
private static boolean saveToRedis(RedisUtils redisUtils,
String avgPx, String pos, String upl,
- String imr, String mgnRatio, String markPx, String bePx) {
+ String imr, String mgnRatio, String markPx, String bePx, String realizedPnl) {
return redisUtils.set(REDIS_KEY_PREFIX + ":avgPx", avgPx, 0)
&& redisUtils.set(REDIS_KEY_PREFIX + ":pos", pos, 0)
&& redisUtils.set(REDIS_KEY_PREFIX + ":upl", upl, 0)
&& redisUtils.set(REDIS_KEY_PREFIX + ":imr", imr, 0)
&& redisUtils.set(REDIS_KEY_PREFIX + ":mgnRatio", mgnRatio, 0)
&& redisUtils.set(REDIS_KEY_PREFIX + ":markPx", markPx, 0)
- && redisUtils.set(REDIS_KEY_PREFIX + ":bePx", bePx, 0);
+ && redisUtils.set(REDIS_KEY_PREFIX + ":bePx", bePx, 0)
+ && redisUtils.set(REDIS_KEY_PREFIX + ":realizedPnl", realizedPnl, 0);
}
private static void calculateAndSaveBuyCount(RedisUtils redisUtils) {
@@ -152,7 +160,7 @@
}
private static String safeGetString(JSONObject obj, String key) {
- return Optional.ofNullable(obj.getString(key)).orElse("");
+ return Optional.ofNullable(obj.getString(key)).orElse("0");
}
private static BigDecimal parseBigDecimal(String value, String defaultValue) {
@@ -185,7 +193,7 @@
leverage.compareTo(BigDecimal.ZERO) <= 0 ||
faceValue.compareTo(BigDecimal.ZERO) <= 0 ||
markPrice.compareTo(BigDecimal.ZERO) <= 0) {
- throw new IllegalArgumentException("所有参数必须大于零");
+ return BigDecimal.ZERO;
}
BigDecimal divisor = markPrice.divide(leverage, 10, BigDecimal.ROUND_DOWN);
--
Gitblit v1.9.1