From f31fc9f42f78de0808e7f4bdc797c5e622df09e3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:22:37 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 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 ff8aea6..8dc97a8 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
@@ -1,14 +1,22 @@
package com.yami.trading.api.controller;
+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;
import com.yami.trading.common.exception.YamiShopBindException;
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;
+import com.yami.trading.service.ico.IcoService;
import com.yami.trading.service.item.ItemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +29,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.stream.Collectors;
/**
* K线图
@@ -40,6 +49,11 @@
@Autowired
@Qualifier("dataService")
private DataService dataService;
+ @Autowired
+ private IcoService icoService;
+
+ @Autowired
+ private DataDBService dataDBService;
@ApiOperation(value = "行情")
@GetMapping(HOBI + "getKline.action")
@@ -74,9 +88,10 @@
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 load chart data");
}
}
+
private List<Map<String, Object>> build(List<Kline> data, String line, String symbol) {
Collections.sort(data);
@@ -131,9 +146,43 @@
map.put("high", high.setScale(decimal, RoundingMode.HALF_UP));
map.put("low", low.setScale(decimal, RoundingMode.HALF_UP));
map.put("volume", kline.getVolume());
+
+ if (i == data.size() - 1 && isRollingIntradayLine(line)) {
+ Realtime realtime = DataCache.getLatestRealTime(symbol);
+ BigDecimal latestClose = close;
+ if (realtime != null && realtime.getClose() != null) {
+ latestClose = realtime.getClose();
+ map.put("close", latestClose.setScale(decimal, RoundingMode.HALF_UP));
+ }
+ BeforeClose beforeClose = dataDBService.getBeforeClose(kline.getSymbol(), line, ts, realtime);
+ BigDecimal periodHigh = high;
+ BigDecimal periodLow = low;
+ if (beforeClose != null) {
+ if (beforeClose.getMaxClose() != null && beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) > 0) {
+ periodHigh = beforeClose.getMaxClose();
+ }
+ if (beforeClose.getMinClose() != null && beforeClose.getMinClose().compareTo(BigDecimal.ZERO) > 0) {
+ periodLow = beforeClose.getMinClose();
+ }
+ }
+ periodHigh = periodHigh.max(latestClose);
+ periodLow = periodLow.min(latestClose);
+ map.put("high", periodHigh.setScale(decimal, RoundingMode.HALF_UP));
+ map.put("low", periodLow.setScale(decimal, RoundingMode.HALF_UP));
+ }
list.add(map);
}
return list;
}
+ /**
+ * 5/15/30/60 分钟未收盘 K 线需用当前周期内的最高/最低价刷新
+ */
+ private boolean isRollingIntradayLine(String line) {
+ return Kline.PERIOD_5MIN.equalsIgnoreCase(line)
+ || Kline.PERIOD_15MIN.equalsIgnoreCase(line)
+ || Kline.PERIOD_30MIN.equalsIgnoreCase(line)
+ || Kline.PERIOD_60MIN.equalsIgnoreCase(line);
+ }
+
}
--
Gitblit v1.9.3