From a2fbe22cb3067cf4d51cb9861a5a6fa78a936366 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Dec 2025 18:06:40 +0800
Subject: [PATCH] feat(kline): 启用K线数据更新任务并优化更新逻辑

---
 src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java |   93 +++++++++++++++++++++++++++++++---------------
 1 files changed, 62 insertions(+), 31 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 172efc7..7c8b91d 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
@@ -66,6 +66,46 @@
         return client;
     }
 
+//    @Override
+//    public void updateSymbolsKine(String time) {
+//        synchronized (this) {
+//            //更新币币交易K线历史数据
+//            for (SymbolEnum symbol : SymbolEnum.values()) {
+//                try {
+//                    Thread.sleep(500);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//                String[] symbols = symbol.getValue().toLowerCase().split("/");
+//                ApiClient client = getClient();
+//                KlineResponse kline = client.kline(symbols[0] + symbols[1], time, 1000 + "");
+//                if (kline != null) {
+//                    if ("ok".equalsIgnoreCase(kline.getStatus())) {
+//                        List<Kline> klines = (List<Kline>) kline.data;
+//                        List<Candlestick> list = new ArrayList<Candlestick>();
+//                        Candlestick candlestick = null;
+//                        for (Kline kline1 : klines) {
+//                            candlestick = new Candlestick();
+//                            candlestick.setAmount(BigDecimal.valueOf(kline1.getAmount()));
+//                            candlestick.setClose(BigDecimal.valueOf(kline1.getClose()));
+//                            candlestick.setCount(kline1.getCount());
+//                            candlestick.setHigh(BigDecimal.valueOf(kline1.getHigh()));
+//                            candlestick.setLow(BigDecimal.valueOf(kline1.getLow()));
+//                            candlestick.setVolume(BigDecimal.valueOf(kline1.getVol()));
+//                            candlestick.setTimestamp(kline1.getId() * 1000);
+//                            candlestick.setOpen(BigDecimal.valueOf(kline1.getOpen()));
+//                            list.add(candlestick);
+//                        }
+//
+//                        if (klines.size() > 0) {
+//                            redisUtils.set("KINE_" + symbol.getValue() + "_" + time, list);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
+
     @Override
     public void updateSymbolsKine(String time) {
         synchronized (this) {
@@ -77,30 +117,20 @@
                     e.printStackTrace();
                 }
                 String[] symbols = symbol.getValue().toLowerCase().split("/");
-                ApiClient client = getClient();
-                KlineResponse kline = client.kline(symbols[0] + symbols[1], time, 1000 + "");
-                if (kline != null) {
-                    if ("ok".equalsIgnoreCase(kline.getStatus())) {
-                        List<Kline> klines = (List<Kline>) kline.data;
-                        List<Candlestick> list = new ArrayList<Candlestick>();
-                        Candlestick candlestick = null;
-                        for (Kline kline1 : klines) {
-                            candlestick = new Candlestick();
-                            candlestick.setAmount(BigDecimal.valueOf(kline1.getAmount()));
-                            candlestick.setClose(BigDecimal.valueOf(kline1.getClose()));
-                            candlestick.setCount(kline1.getCount());
-                            candlestick.setHigh(BigDecimal.valueOf(kline1.getHigh()));
-                            candlestick.setLow(BigDecimal.valueOf(kline1.getLow()));
-                            candlestick.setVolume(BigDecimal.valueOf(kline1.getVol()));
-                            candlestick.setTimestamp(kline1.getId() * 1000);
-                            candlestick.setOpen(BigDecimal.valueOf(kline1.getOpen()));
-                            list.add(candlestick);
-                        }
 
-                        if (klines.size() > 0) {
-                            redisUtils.set("KINE_" + symbol.getValue() + "_" + time, list);
-                        }
-                    }
+                String instId = symbols[0] +"-"+ symbols[1];
+                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);
+                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);
                 }
             }
         }
@@ -192,14 +222,15 @@
     @Override
     public Result findKlineList(KlineVo klineDetailDto) {
         Integer type = klineDetailDto.getType();
-        String instId = null;
-        if (AppContants.HOME_SYMBOLS_COIN == type){
-            instId = CoinTypeConvert.convertToCoinKlineKey(klineDetailDto.getInstId());
-        }else if (AppContants.HOME_SYMBOLS_CONTRACT == type){
-            instId = CoinTypeConvert.convertToKlineKey(klineDetailDto.getInstId());
-        }else{
-            return Result.fail("参数错误");
-        }
+        String instId = klineDetailDto.getInstId();
+//        String instId = null;
+//        if (AppContants.HOME_SYMBOLS_COIN == type){
+//            instId = CoinTypeConvert.convertToCoinKlineKey(klineDetailDto.getInstId());
+//        }else if (AppContants.HOME_SYMBOLS_CONTRACT == type){
+//            instId = CoinTypeConvert.convertToKlineKey(klineDetailDto.getInstId());
+//        }else{
+//            return Result.fail("参数错误");
+//        }
         String bar = klineDetailDto.getBar();
         LinkedHashMap<String, Object> requestParam = new LinkedHashMap<>();
         requestParam.put("instId",instId);

--
Gitblit v1.9.1