From 915218a43e8d7eb7b0d938151c6e0e1deba6f152 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 26 Dec 2025 10:58:05 +0800
Subject: [PATCH] refactor(symbols): 重命名K线时长字段从period到bar

---
 src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java |   65 +++++++++++++++-----------------
 1 files changed, 30 insertions(+), 35 deletions(-)

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 7c8b91d..8791fcf 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
@@ -111,27 +111,20 @@
         synchronized (this) {
             //更新币币交易K线历史数据
             for (SymbolEnum symbol : SymbolEnum.values()) {
-                try {
-                    Thread.sleep(500);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
                 String[] symbols = symbol.getValue().toLowerCase().split("/");
-
                 String instId = symbols[0] +"-"+ symbols[1];
+                instId  = instId.toUpperCase() ;
                 String bar = time;
                 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);
+                log.info("加载OKX-KLINE,{}", instId);
                 JSONObject json = JSON.parseObject(result);
                 String data = json.getString("data");
-                List<String[]> klinesList = JSON.parseArray(data, String[].class);
-                if (klinesList != null) {
-                    redisUtils.set("KINE_" + instId + "_" + time, klinesList);
-                }
+                log.info("加载OKX-KLINE,{}", data);
+                redisUtils.set("KINE_" + instId + "_" + time, data);
             }
         }
     }
@@ -189,34 +182,36 @@
         String key = "KINE_{}_{}";
         // 币币k线数据
         if (AppContants.HOME_SYMBOLS_COIN == klineDetailDto.getType()) {
-            key = StrUtil.format(key, klineDetailDto.getSymbol(), klineDetailDto.getPeriod());
+            key = StrUtil.format(key, klineDetailDto.getSymbol(), klineDetailDto.getBar());
             // 合约k线数据
         } else {
-            key = StrUtil.format(key, klineDetailDto.getSymbol(), klineDetailDto.getPeriod());
+            key = StrUtil.format(key, klineDetailDto.getSymbol(), klineDetailDto.getBar());
         }
 
-        Object data = redisUtils.get(key);
-        if (data != null) {
-            List list = (List) data;
-            int length = 0;
-            // 默认获取k线900个柱状(超出会报错)
-            int size = 900;
-
-            if (list.size() > size) {
-                length = size - 1;
-            } else {
-                length = list.size() - 1;
-            }
-
-            List<KlineDataVo> result = new ArrayList<>(length);
-            for (int i = length; i > 0; i--) {
-                Candlestick object = (Candlestick) list.get(i);
-                KlineDataVo klineDataVo = CandlestickMapper.INSTANCE.toKlineDataVo(object);
-                result.add(klineDataVo);
-            }
-            return Result.ok(result);
-        }
-        return Result.fail("获取数据失败");
+        String data = redisUtils.getString(key);
+        List<String[]> klinesList = JSON.parseArray(data, String[].class);
+        return Result.ok(klinesList);
+//        if (data != null) {
+//            List list = (List) data;
+//            int length = 0;
+//            // 默认获取k线900个柱状(超出会报错)
+//            int size = 900;
+//
+//            if (list.size() > size) {
+//                length = size - 1;
+//            } else {
+//                length = list.size() - 1;
+//            }
+//
+//            List<KlineDataVo> result = new ArrayList<>(length);
+//            for (int i = length; i > 0; i--) {
+//                Candlestick object = (Candlestick) list.get(i);
+//                KlineDataVo klineDataVo = CandlestickMapper.INSTANCE.toKlineDataVo(object);
+//                result.add(klineDataVo);
+//            }
+//            return Result.ok(result);
+//        }
+//        return Result.fail("获取数据失败");
     }
 
     @Override

--
Gitblit v1.9.1