Administrator
6 days ago 1b4c522688e77827e9fe3abf1e1bc5c98b214e99
```
chore(okxNewPrice): 注释平仓逻辑代码

- 注释了平仓相关的策略执行代码
- 保留了原有的日志记录和错误处理机制
- 临时禁用MACD MA策略的平仓功能
```
1 files modified
115 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java 115 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java
@@ -399,64 +399,65 @@
                            }
                        }
                    }
                }else{
                    log.info("{}平仓{}:{}",time,closePx,instId);
                    //调用策略
                    // 创建策略实例
                    MacdMaStrategy strategy = new MacdMaStrategy();
                    // 生成200个1m价格数据点
                    List<Kline> kline1MinuteData = getKlineDataByInstIdAndBar(instId, "1m");
                    List<BigDecimal> historicalPrices1M = kline1MinuteData.stream()
                            .map(Kline::getC)
                            .collect(Collectors.toList());
                    // 生成200个1D价格数据点
                    List<Kline> kline1DayData = getKlineDataByInstIdAndBar(instId, "1D");
                    List<BigDecimal> historicalPrices1D = kline1DayData.stream()
                            .map(Kline::getC)
                            .collect(Collectors.toList());
                    // 使用策略分析最新价格数据
                    MacdMaStrategy.TradingOrder tradingOrderOpenClose = strategy.generateTradingOrder(historicalPrices1M,historicalPrices1D,MacdMaStrategy.OperationType.close.name());
                    if (tradingOrderOpenClose == null){
                        return;
                    }
                    Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
                    //如果为空,则直接返回
                    if (allClients.isEmpty()) {
                        return;
                    }
                    // 获取所有OkxQuantWebSocketClient实例
                    for (OkxQuantWebSocketClient client : clientManager.getAllClients()) {
                        String accountName = client.getAccountName();
                        if (accountName != null) {
                            if (ObjectUtil.isNotEmpty(tradingOrderOpenClose)){
                                // 根据信号执行交易操作
                                TradeRequestParam tradeRequestParam = new TradeRequestParam();
                                tradeRequestParam.setAccountName(accountName);
                                tradeRequestParam.setMarkPx(String.valueOf(closePx));
                                tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
                                tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
                                tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
                                String posSide = tradingOrderOpenClose.getPosSide();
                                tradeRequestParam.setPosSide(posSide);
                                String side = tradingOrderOpenClose.getSide();
                                tradeRequestParam.setSide(side);
                                String clOrdId = WsParamBuild.getOrderNum(side);
                                tradeRequestParam.setClOrdId(clOrdId);
                                String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
                                BigDecimal pos = PositionsWs.getAccountMap(positionAccountName).get("pos");
                                tradeRequestParam.setSz(String.valueOf(pos));
                                TradeOrderWs.orderZhiYingZhiSunEventNoState(client.getWebSocketClient(), tradeRequestParam);
                            }
                        }
                    }
                }
//                else{
//                    log.info("{}平仓{}:{}",time,closePx,instId);
//                    //调用策略
//                    // 创建策略实例
//                    MacdMaStrategy strategy = new MacdMaStrategy();
//
//                    // 生成200个1m价格数据点
//                    List<Kline> kline1MinuteData = getKlineDataByInstIdAndBar(instId, "1m");
//                    List<BigDecimal> historicalPrices1M = kline1MinuteData.stream()
//                            .map(Kline::getC)
//                            .collect(Collectors.toList());
//
//
//                    // 生成200个1D价格数据点
//                    List<Kline> kline1DayData = getKlineDataByInstIdAndBar(instId, "1D");
//                    List<BigDecimal> historicalPrices1D = kline1DayData.stream()
//                            .map(Kline::getC)
//                            .collect(Collectors.toList());
//                    // 使用策略分析最新价格数据
//                    MacdMaStrategy.TradingOrder tradingOrderOpenClose = strategy.generateTradingOrder(historicalPrices1M,historicalPrices1D,MacdMaStrategy.OperationType.close.name());
//                    if (tradingOrderOpenClose == null){
//                        return;
//                    }
//
//                    Collection<OkxQuantWebSocketClient> allClients = clientManager.getAllClients();
//                    //如果为空,则直接返回
//                    if (allClients.isEmpty()) {
//                        return;
//                    }
//                    // 获取所有OkxQuantWebSocketClient实例
//                    for (OkxQuantWebSocketClient client : clientManager.getAllClients()) {
//                        String accountName = client.getAccountName();
//                        if (accountName != null) {
//                            if (ObjectUtil.isNotEmpty(tradingOrderOpenClose)){
//                                // 根据信号执行交易操作
//                                TradeRequestParam tradeRequestParam = new TradeRequestParam();
//                                tradeRequestParam.setAccountName(accountName);
//                                tradeRequestParam.setMarkPx(String.valueOf(closePx));
//                                tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
//                                tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
//                                tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
//                                String posSide = tradingOrderOpenClose.getPosSide();
//                                tradeRequestParam.setPosSide(posSide);
//
//                                String side = tradingOrderOpenClose.getSide();
//                                tradeRequestParam.setSide(side);
//
//                                String clOrdId = WsParamBuild.getOrderNum(side);
//                                tradeRequestParam.setClOrdId(clOrdId);
//
//                                String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
//                                BigDecimal pos = PositionsWs.getAccountMap(positionAccountName).get("pos");
//                                tradeRequestParam.setSz(String.valueOf(pos));
//                                TradeOrderWs.orderZhiYingZhiSunEventNoState(client.getWebSocketClient(), tradeRequestParam);
//                            }
//                        }
//                    }
//                }
            }
        } catch (Exception e) {
            log.error("处理 K线频道推送数据失败", e);