From 640ccb9229224642515527daf87f308a7aa9bdf4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:47:26 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 0de1290..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
@@ -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.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;
@@ -10,6 +11,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.DataCache;
import com.yami.trading.huobi.data.internal.DataDBService;
import com.yami.trading.huobi.data.internal.KlineService;
import com.yami.trading.service.data.DataService;
@@ -121,7 +123,7 @@
return Result.succeed(this.build(data, line, symbol));
} catch (Exception e) {
logger.error("getKline error", e);
- throw new YamiShopBindException("k线图获取失败");
+ throw new YamiShopBindException("Failed to obtain the K-line chart");
}
}
@@ -179,15 +181,27 @@
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 (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);
+ 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));
+ }
}
- }
+ //}
list.add(map);
}
return list;
--
Gitblit v1.9.3