blame | history | patch | commit | commitdiff | ignore whitespace
Administrator
6 days ago fe4d5467b8431ef1461bc93e4eba4f9153125da9 
 src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java


@@ -4,22 +4,21 @@


import com.alibaba.fastjson.JSONObject;


import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;


import com.xcong.excoin.modules.okxNewPrice.okxWs.*;


import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;


import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.ExchangeInfoEnum;


import com.xcong.excoin.modules.okxNewPrice.okxWs.param.TradeRequestParam;


import com.xcong.excoin.modules.okxNewPrice.utils.SSLConfig;


import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeService;


import com.xcong.excoin.utils.RedisUtils;


import lombok.extern.slf4j.Slf4j;


import org.java_websocket.client.WebSocketClient;


import org.java_websocket.handshake.ServerHandshake;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;


import org.springframework.stereotype.Component;




import javax.annotation.PostConstruct;


import javax.annotation.PreDestroy;


import java.math.BigDecimal;


import java.net.URI;


import java.net.URISyntaxException;


import java.util.List;


import java.util.concurrent.*;


import java.util.concurrent.atomic.AtomicBoolean;


import java.util.concurrent.atomic.AtomicReference;


@@ -34,6 +33,7 @@


public class OkxQuantWebSocketClient {


    private final RedisUtils redisUtils;


    private final ExchangeInfoEnum account;


    private final CaoZuoService caoZuoService;




    private WebSocketClient webSocketClient;


    private ScheduledExecutorService heartbeatExecutor;


@@ -61,8 +61,10 @@


    }


    


    public OkxQuantWebSocketClient(ExchangeInfoEnum account,


                                   CaoZuoService caoZuoService,


                                   RedisUtils redisUtils) {


        this.account = account;


        this.caoZuoService = caoZuoService;


        this.redisUtils = redisUtils;


    }




@@ -382,8 +384,9 @@


        // 注意：当前实现中，OrderInfoWs等类使用静态Map存储数据


        // 这会导致多账号之间的数据冲突。需要进一步修改这些类的设计，让数据存储与特定账号关联


        if (OrderInfoWs.ORDERINFOWS_CHANNEL.equals(channel)) {


            TradeRequestParam tradeRequestParam = OrderInfoWs.handleEvent(response, redisUtils, account.name());


            TradeOrderWs.orderZhiYingEvent(webSocketClient, tradeRequestParam);


//            OrderInfoWs.handleEvent(response, redisUtils, account.name());


            List<TradeRequestParam> tradeRequestParams = OrderInfoWs.handleEvent(response, redisUtils, account.name());


            TradeOrderWs.orderZhiYingZhiSunEventNoState(webSocketClient, tradeRequestParams);


        }else if (AccountWs.ACCOUNTWS_CHANNEL.equals(channel)) {


            AccountWs.handleEvent(response, account.name());


        } else if (PositionsWs.POSITIONSWS_CHANNEL.equals(channel)) {