From 6d8a950aa7769b1d26fb86f7453ab450d19096ec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 05 Mar 2026 10:36:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.24-blue' into 2.24-blue
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 15 +++++++++++++++
1 files changed, 15 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..0de1290 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,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yami.trading.bean.data.domain.Kline;
+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 +10,7 @@
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.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 +49,9 @@
private DataService dataService;
@Autowired
private IcoService icoService;
+
+ @Autowired
+ private DataDBService dataDBService;
@ApiOperation(value = "行情")
@GetMapping(HOBI + "getKline.action")
@@ -173,6 +178,16 @@
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) {
+ BeforeClose beforeClose = dataDBService.getBeforeClose(kline.getSymbol(), line, ts);
+ 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