From 030e1d50c1f643137220f1ecf1d90ce39174204a Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Sat, 30 May 2026 01:58:54 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 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 e9e9936..61df12d 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
@@ -123,7 +123,7 @@
return Result.succeed(this.build(data, line, symbol));
} catch (Exception e) {
logger.error("getKline error", e);
- throw new YamiShopBindException("");
+ throw new YamiShopBindException("Failed to obtain the K-line chart");
}
}
@@ -181,20 +181,30 @@
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));
- }
+ if (i == data.size() - 1) {
+ BigDecimal periodHigh = high;
+ BigDecimal periodLow = low;
+ BigDecimal closePrice = close;
+ Realtime realtime = DataCache.getLatestRealTime(symbol);
+ if (realtime != null && realtime.getClose() != null
+ && realtime.getClose().compareTo(BigDecimal.ZERO) > 0) {
+ closePrice = realtime.getClose();
+ map.put("close", closePrice.setScale(decimal, RoundingMode.HALF_UP));
}
- //}
+ BeforeClose beforeClose = dataDBService.getBeforeClose(kline.getSymbol(), line, ts, realtime);
+ if (beforeClose != null
+ && beforeClose.getMaxClose() != null && beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) > 0
+ && beforeClose.getMinClose() != null && beforeClose.getMinClose().compareTo(BigDecimal.ZERO) > 0) {
+ periodHigh = periodHigh.max(beforeClose.getMaxClose());
+ periodLow = periodLow.min(beforeClose.getMinClose());
+ }
+ if (closePrice != null && closePrice.compareTo(BigDecimal.ZERO) > 0) {
+ periodHigh = periodHigh.max(closePrice);
+ periodLow = periodLow.min(closePrice);
+ }
+ map.put("high", periodHigh.setScale(decimal, RoundingMode.HALF_UP));
+ map.put("low", periodLow.setScale(decimal, RoundingMode.HALF_UP));
+ }
list.add(map);
}
return list;
--
Gitblit v1.9.3