From 3d1469b456ba56421b0dcdad26f0a335550c174f Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 22 Dec 2025 16:35:58 +0800
Subject: [PATCH] feat(newPrice): 添加K线时间粒度参数支持

---
 src/main/java/com/xcong/excoin/modules/newPrice/KlineVo.java                        |    4 ++++
 src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java |    3 +++
 src/main/java/com/xcong/excoin/modules/newPrice/utils/OKXContants.java              |    4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/newPrice/KlineVo.java b/src/main/java/com/xcong/excoin/modules/newPrice/KlineVo.java
index 3665b0d..98eaece 100644
--- a/src/main/java/com/xcong/excoin/modules/newPrice/KlineVo.java
+++ b/src/main/java/com/xcong/excoin/modules/newPrice/KlineVo.java
@@ -17,6 +17,10 @@
     private String instId;
 
     @NotNull
+    @ApiModelProperty(value = "时间粒度,默认值1m", example = "时间粒度,默认值1m,如 [1s/1m/3m/5m/15m/30m/1H/2H/4H]")
+    private String bar;
+
+    @NotNull
     @ApiModelProperty(value = "类型 1-币币2-合约", example = "1")
     private Integer type;
 
diff --git a/src/main/java/com/xcong/excoin/modules/newPrice/utils/OKXContants.java b/src/main/java/com/xcong/excoin/modules/newPrice/utils/OKXContants.java
index 6426533..6e211ad 100644
--- a/src/main/java/com/xcong/excoin/modules/newPrice/utils/OKXContants.java
+++ b/src/main/java/com/xcong/excoin/modules/newPrice/utils/OKXContants.java
@@ -20,8 +20,8 @@
      * https://www.okx.com/docs-v5/zh/#rest-api-public-data-get-instruments</a>
      */
     public static final String INSTRUMENTS = "/api/v5/public/instruments";
-//    public static final String K_LINE_HISTORY = "/api/v5/market/history-candles";
-    public static final String K_LINE_HISTORY = "/api/v5/market/history-mark-price-candles";
+    public static final String K_LINE_HISTORY = "/api/v5/market/history-candles";
+//    public static final String K_LINE_HISTORY = "/api/v5/market/history-mark-price-candles";
     /**
      * 查看账户余额
      * 获取交易账户中资金余额信息。
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
index cc882f8..172efc7 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
@@ -200,8 +200,11 @@
         }else{
             return Result.fail("参数错误");
         }
+        String bar = klineDetailDto.getBar();
         LinkedHashMap<String, Object> requestParam = new LinkedHashMap<>();
         requestParam.put("instId",instId);
+        requestParam.put("bar",bar);
+        requestParam.put("limit","300");
         String result = ExchangeLoginService.getInstance(ExchangeInfoEnum.OKX_UAT.name()).lineHistory(requestParam);
         log.info("加载OKX-KLINE,{}", result);
         JSONObject json = JSON.parseObject(result);

--
Gitblit v1.9.1