From c8b80dc38d75e89aa44574659b154ddea2e8fce5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 07 Jan 2026 14:16:32 +0800
Subject: [PATCH] refactor(okx): 重构WebSocket客户端实现止盈止损逻辑

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java |   83 +----------------------------------------
 1 files changed, 2 insertions(+), 81 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
index 5586822..3abaa37 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
+++ b/src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
@@ -133,10 +133,9 @@
     public static void orderZhiYingEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
 
 
-        log.info("开始执行TradeOrderWs......");
+        log.info("开始执行限价{}......",JSONUtil.parse(tradeRequestParam));
         if (tradeRequestParam == null){
-
-            log.warn("下单{}参数缺失,取消发送",tradeRequestParam);
+            log.warn("限价下单参数缺失,取消发送");
             return;
         }
         String accountName = tradeRequestParam.getAccountName();
@@ -209,84 +208,6 @@
             log.error("下单构建失败", e);
         }
     }
-
-    public static void orderZhiSunEvent(WebSocketClient webSocketClient, List<TradeRequestParam> tradeRequestParams) {
-
-        log.info("开始止损......");
-        if (CollUtil.isEmpty(tradeRequestParams)){
-            log.error("止损下单{}参数缺失,取消发送", JSONUtil.parse(tradeRequestParams));
-            return;
-        }
-        for (TradeRequestParam tradeRequestParam : tradeRequestParams){
-            String accountName = tradeRequestParam.getAccountName();
-            String markPx = tradeRequestParam.getMarkPx();
-            String instId = tradeRequestParam.getInstId();
-            String tdMode = tradeRequestParam.getTdMode();
-            String posSide = tradeRequestParam.getPosSide();
-            String ordType = tradeRequestParam.getOrdType();
-
-            String tradeType = tradeRequestParam.getTradeType();
-
-            String clOrdId = tradeRequestParam.getClOrdId();
-            String side = tradeRequestParam.getSide();
-            String sz = tradeRequestParam.getSz();
-            /**
-             * 校验必要参数
-             * 验证下单参数是否存在空值
-             */
-            if (
-                    StrUtil.isBlank(accountName)
-                            || StrUtil.isBlank(instId)
-                            || StrUtil.isBlank(tdMode)
-                            || StrUtil.isBlank(posSide)
-                            || StrUtil.isBlank(ordType)
-                            || StrUtil.isBlank(clOrdId)
-                            || StrUtil.isBlank(side)
-                            || StrUtil.isBlank(sz)
-                            || StrUtil.isBlank(markPx)
-
-            ){
-                log.error("止损下单参数缺失,取消发送");
-                return;
-            }
-            log.info("止损账户:{},触发价格:{},币种:{},方向:{},买卖:{},数量:{},是否允许下单:{},编号:{},",
-                    accountName, markPx, instId, posSide,side,  sz, tradeType, clOrdId);
-            //验证是否允许下单
-            if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
-                log.error("止损账户{}不允许下单,取消发送", accountName);
-                return;
-            }
-            /**
-             * 检验账户和仓位是否准备就绪
-             * 开多:买入开多(side 填写 buy; posSide 填写 long )
-             * 开空:卖出开空(side 填写 sell; posSide 填写 short ) 需要检验账户通道是否准备就绪
-             * 平多:卖出平多(side 填写 sell;posSide 填写 long )
-             * 平空:买入平空(side 填写 buy; posSide 填写 short ) 需要检验仓位通道是否准备就绪
-             */
-            try {
-                JSONArray argsArray = new JSONArray();
-                JSONObject args = new JSONObject();
-                args.put("instId", instId);
-                args.put("tdMode", tdMode);
-                args.put("clOrdId", clOrdId);
-                args.put("side", side);
-
-                args.put("posSide", posSide);
-                args.put("ordType", ordType);
-                args.put("sz", sz);
-                args.put("px", markPx);
-                argsArray.add(args);
-
-                String connId = WsParamBuild.getOrderNum(ORDERWS_CHANNEL);
-                JSONObject jsonObject = WsParamBuild.buildJsonObject(connId, ORDERWS_CHANNEL, argsArray);
-                webSocketClient.send(jsonObject.toJSONString());
-                log.info("止损已发送......");
-            } catch (Exception e) {
-                log.error("下单构建失败", e);
-            }
-        }
-    }
-
 
 
     /**

--
Gitblit v1.9.1