From 45572e4fa21220854faaef378248d8322b59da7a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 16 Dec 2025 17:13:30 +0800
Subject: [PATCH] feat(okxWs): 启用持仓频道日志记录功能

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 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..3a0514b 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
@@ -41,28 +41,34 @@
             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) {
 
 
-//        log.info("开始执行PositionsWs......");
+        log.info("开始执行PositionsWs......");
         try {
             JSONArray dataArray = response.getJSONArray("data");
             if (dataArray == null || dataArray.isEmpty()) {
-//                log.info("账户持仓频道数据为空,已当前价买入,并且初始化网格");
+                log.info("账户持仓频道数据为空,已当前价买入,并且初始化网格");
                 JSONObject posData = new JSONObject();
-                initParam(posData, accountName);
+                initParam(posData, accountName,CoinEnums.POSSIDE_LONG.getCode());
+                initParam(posData, accountName,CoinEnums.POSSIDE_SHORT.getCode());
                 return;
             }
 
@@ -70,7 +76,7 @@
                 JSONObject posData = dataArray.getJSONObject(i);
                 String instId = posData.getString("instId");
                 if (CoinEnums.HE_YUE.getCode().equals(instId)) {
-//                    log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
+                    log.info("查询到账户{}持仓数据",CoinEnums.HE_YUE.getCode());
                     String mgnMode = posData.getString("mgnMode");
                     String posSide = posData.getString("posSide");
                     String pos = posData.getString("pos");
@@ -104,8 +110,7 @@
                             last, idxPx, bePx, realizedPnl, settledPnl,
                             markPx,fee,fundingFee
                     );
-
-                    initParam(posData, accountName);
+                    initParam(posData, accountName,posSide);
                 }
             }
         } catch (Exception e) {
@@ -113,8 +118,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")));

--
Gitblit v1.9.1