From 54a5b503d811f7ca3f356728c3ab1e04451a9a86 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 20 Dec 2025 16:49:09 +0800
Subject: [PATCH] 1

---
 trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java |   58 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
index 7b6966d..33eeaa9 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
@@ -37,12 +37,12 @@
     @Autowired
     private NamedParameterJdbcOperations namedParameterJdbcTemplate;
 
-    public static void main(String[] args) {
-        BigDecimal a = BigDecimal.valueOf(0.0007);
-        BigDecimal b = BigDecimal.valueOf(333);
-        BigDecimal c = a.divide(b, 6, BigDecimal.ROUND_HALF_UP);
+    /*public static void main(String[] args) {
+        BigDecimal a = BigDecimal.valueOf(0.003);
+        BigDecimal b = BigDecimal.valueOf(7200);
+        BigDecimal c = a.divide(b, 10, BigDecimal.ROUND_HALF_UP);
         System.out.println(c);
-    }
+    }*/
     @Override
     public void initBySql(String symbol) {
         this.bulidBySql(symbol, Kline.PERIOD_1MIN);
@@ -108,8 +108,7 @@
 
     public void bulid(String symbol, String line) {
         RequestDataHelper.set("symbol", symbol);
-        List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, null,
-                0);
+        List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, null);
         KlineTimeObject model = new KlineTimeObject();
         Collections.sort(list); // 按时间升序
         model.setKline(list);
@@ -179,37 +178,45 @@
 
     @Override
     public void saveOneByHuoBi(String symbol, String line) {
-        RequestDataHelper.set("symbol", symbol);
-        List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, 2,
-                0);
+        List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, 2);
         if (list == null || list.isEmpty()) {
             return;
         }
         Kline kline = list.get(0);
         BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
-        if (currentValue != null && currentValue.compareTo(BigDecimal.ZERO) > 0) {
+        if (currentValue != null && currentValue.compareTo(BigDecimal.ZERO) != 0) {
             if (!kline.isAdjusted()){
                 kline.setClose(kline.getClose().add(currentValue));
                 kline.setOpen(kline.getOpen().add(currentValue));
                 kline.setLow(kline.getLow().add(currentValue));
                 kline.setHigh(kline.getHigh().add(currentValue));
                 kline.setAdjusted(true);
-
-                /*BigDecimal last = AdjustmentValueCache.getLastValue().get(symbol);
-                if (last != null && last.compareTo(BigDecimal.ZERO) > 0) {
-                    BigDecimal adj = currentValue.subtract(last);
-                    if (adj.compareTo(BigDecimal.ZERO) > 0) { //递增
-                        kline.setOpen(kline.getOpen().subtract(adj));
-                        kline.setLow(kline.getLow().subtract(adj));
-                    } else if(adj.compareTo(BigDecimal.ZERO) < 0){ //递减
-                        kline.setOpen(kline.getOpen().subtract(adj));
-                        kline.setHigh(kline.getHigh().subtract(adj));
-                    }
-                } else {
-                    AdjustmentValueCache.getLastValue().put(symbol, currentValue);
-                }*/
             }
         }
+
+
+        //获取上一条数据
+        Kline lastKline = DataCache.getLastKline().get(symbol + line);;
+        if (lastKline == null) {
+            List<Kline> lastList = this.find(symbol, line, 1);
+            if (lastList.size() > 0) {
+                lastKline = lastList.get(0);
+            }
+        }
+        //补差
+        if (lastKline != null) {
+            BigDecimal diff = kline.getOpen().subtract(lastKline.getClose());
+            if (diff.compareTo(BigDecimal.ZERO) > 0) {
+                kline.setOpen(kline.getOpen().subtract(diff));
+                kline.setLow(kline.getLow().subtract(diff));
+            } else if (diff.compareTo(BigDecimal.ZERO) < 0) {
+                kline.setOpen(kline.getOpen().subtract(diff));
+                kline.setHigh(kline.getHigh().subtract(diff));
+            }
+        }
+
+
+        RequestDataHelper.set("symbol", symbol);
         klineDBService.save(kline);
         KlineTimeObject timeObject = DataCache.getKline(symbol, line);
         if (timeObject == null) {
@@ -218,6 +225,7 @@
         timeObject.getKline().add(kline);
         timeObject.setLastTime(new Date());
         DataCache.putKline(symbol, line, timeObject);
+        DataCache.getLastKline().put(symbol + line, kline);
         RequestDataHelper.clear();
     }
 

--
Gitblit v1.9.3