From 6e09aa2c20ff596c2dfae165d94a9af8ce281030 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 05 Jun 2026 10:12:12 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 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 61df12d..d4e1106 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
@@ -181,30 +181,27 @@
map.put("low", low.setScale(decimal, RoundingMode.HALF_UP));
map.put("volume", kline.getVolume());
- 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));
+ //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 && realtime.getClose() != null && realtime.getClose().compareTo(BigDecimal.ZERO) > 0) {
+ 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));
+ }
+ BigDecimal openVal = (BigDecimal) map.get("open");
+ BigDecimal closeVal = (BigDecimal) map.get("close");
+ BigDecimal highVal = (BigDecimal) map.get("high");
+ BigDecimal lowVal = (BigDecimal) map.get("low");
+ if (openVal != null && closeVal != null) {
+ map.put("high", highVal.max(openVal).max(closeVal));
+ map.put("low", lowVal.min(openVal).min(closeVal));
+ }
}
- 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