fix(okxNewPrice): 修复止损逻辑并添加价格比较日志

Administrator

5 days ago 0f3d23847ceda5fc72bb6a971ffdfaf881631b95

 src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxWebSocketClientManager.java

@@ -2,7 +2,9 @@

import com.xcong.excoin.modules.okxNewPrice.celue.CaoZuoService;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.ExchangeInfoEnum;
import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListService;
import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeService;
import com.xcong.excoin.rabbit.pricequeue.WebsocketPriceService;
import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,14 +24,17 @@
@ConditionalOnProperty(prefix = "app", name = "quant", havingValue = "true")
public class OkxWebSocketClientManager {
    @Autowired
    private WangGeService wangGeService;
    @Autowired
    private CaoZuoService caoZuoService;
    @Autowired
    private RedisUtils redisUtils;
    @Autowired
    private WangGeListService wangGeListService;

    // 存储所有WebSocket客户端实例，key为账号类型名称
    private final Map<String, OkxQuantWebSocketClient> clientMap = new ConcurrentHashMap<>();
    // 存储所有OkxQuantWebSocketClient实例，key为账号类型名称
    private final Map<String, OkxQuantWebSocketClient> quantClientMap = new ConcurrentHashMap<>();
    
    // 存储OkxNewPriceWebSocketClient实例
    private OkxNewPriceWebSocketClient newPriceClient;

    /**
     * 初始化方法，在Spring Bean构造完成后执行
@@ -39,14 +44,23 @@
    public void init() {
        log.info("开始初始化OkxWebSocketClientManager");
        
        // 初始化价格WebSocket客户端
        try {
            newPriceClient = new OkxNewPriceWebSocketClient(redisUtils, caoZuoService, this, wangGeListService);
            newPriceClient.init();
            log.info("已初始化OkxNewPriceWebSocketClient");
        } catch (Exception e) {
            log.error("初始化OkxNewPriceWebSocketClient失败", e);
        }
        
        // 获取所有ExchangeInfoEnum枚举值
        ExchangeInfoEnum[] accounts = ExchangeInfoEnum.values();
        
        // 为每个账号创建一个WebSocket客户端实例
        for (ExchangeInfoEnum account : accounts) {
            try {
                OkxQuantWebSocketClient client = new OkxQuantWebSocketClient(account, wangGeService, caoZuoService, redisUtils);
                clientMap.put(account.name(), client);
                OkxQuantWebSocketClient client = new OkxQuantWebSocketClient(account, redisUtils, caoZuoService, wangGeListService);
                quantClientMap.put(account.name(), client);
                client.init();
                log.info("已初始化账号 {} 的WebSocket客户端", account.name());
            } catch (Exception e) {
@@ -65,8 +79,18 @@
    public void destroy() {
        log.info("开始销毁OkxWebSocketClientManager");
        
        // 关闭所有客户端实例
        for (Map.Entry<String, OkxQuantWebSocketClient> entry : clientMap.entrySet()) {
        // 关闭价格WebSocket客户端
        if (newPriceClient != null) {
            try {
                newPriceClient.destroy();
                log.info("已销毁OkxNewPriceWebSocketClient");
            } catch (Exception e) {
                log.error("销毁OkxNewPriceWebSocketClient失败", e);
            }
        }
        
        // 关闭所有量化交易WebSocket客户端实例
        for (Map.Entry<String, OkxQuantWebSocketClient> entry : quantClientMap.entrySet()) {
            try {
                OkxQuantWebSocketClient client = entry.getValue();
                client.destroy();
@@ -77,25 +101,33 @@
        }
        
        // 清空客户端映射
        clientMap.clear();
        quantClientMap.clear();
        
        log.info("OkxWebSocketClientManager销毁完成");
    }

    /**
     * 获取指定账号的WebSocket客户端实例
     * 获取指定账号的OkxQuantWebSocketClient实例
     * @param accountName 账号类型名称
     * @return WebSocket客户端实例
     */
    public OkxQuantWebSocketClient getClient(String accountName) {
        return clientMap.get(accountName);
        return quantClientMap.get(accountName);
    }

    /**
     * 获取所有WebSocket客户端实例
     * 获取所有OkxQuantWebSocketClient实例
     * @return 所有客户端实例的集合
     */
    public Collection<OkxQuantWebSocketClient> getAllClients() {
        return clientMap.values();
        return quantClientMap.values();
    }
    
    /**
     * 获取OkxNewPriceWebSocketClient实例
     * @return 价格WebSocket客户端实例
     */
    public OkxNewPriceWebSocketClient getNewPriceClient() {
        return newPriceClient;
    }
}