From 513e5442723f501525bf9ca6210b16561e5d3a2b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 24 Mar 2026 11:41:07 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java
index 9367bb0..3eea33f 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yami.trading.bean.data.domain.Kline;
+import com.yami.trading.bean.data.domain.Realtime;
+import com.yami.trading.bean.data.dto.BeforeClose;
 import com.yami.trading.bean.ico.domain.Ico;
 import com.yami.trading.bean.item.domain.Item;
 import com.yami.trading.common.domain.Result;
@@ -9,6 +11,8 @@
 import com.yami.trading.common.util.DateUtils;
 import com.yami.trading.common.web.ResultObject;
 import com.yami.trading.huobi.data.AdjustmentValueCache;
+import com.yami.trading.huobi.data.DataCache;
+import com.yami.trading.huobi.data.internal.DataDBService;
 import com.yami.trading.huobi.data.internal.KlineService;
 import com.yami.trading.service.data.DataService;
 import com.yami.trading.service.etf.MarketService;
@@ -47,6 +51,9 @@
     private DataService dataService;
     @Autowired
     private IcoService icoService;
+
+    @Autowired
+    private DataDBService dataDBService;
 
     @ApiOperation(value = "行情")
     @GetMapping(HOBI + "getKline.action")
@@ -173,6 +180,21 @@
             map.put("high", high.setScale(decimal, RoundingMode.HALF_UP));
             map.put("low", low.setScale(decimal, RoundingMode.HALF_UP));
             map.put("volume", kline.getVolume());
+
+            //if (line.equalsIgnoreCase(Kline.PERIOD_15MIN) || line.equalsIgnoreCase(Kline.PERIOD_30MIN) || line.equalsIgnoreCase(Kline.PERIOD_60MIN)) {
+                if (i == data.size() - 1) {
+                    //获取当前价格
+                    Realtime realtime = DataCache.getLatestRealTime(symbol);
+                    if (realtime != null) {
+                        map.put("close", realtime.getClose().setScale(decimal, RoundingMode.HALF_UP));
+                    }
+                    BeforeClose beforeClose = dataDBService.getBeforeClose(kline.getSymbol(), line, ts, realtime);
+                    if (beforeClose != null) {
+                        map.put("high", beforeClose.getMaxClose().setScale(decimal, RoundingMode.HALF_UP));
+                        map.put("low", beforeClose.getMinClose().setScale(decimal, RoundingMode.HALF_UP));
+                    }
+                }
+            //}
             list.add(map);
         }
         return list;

--
Gitblit v1.9.3