From 9fa09b7700040b6cf416081ba0edfcfb72219b16 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 05 Mar 2026 18:43:26 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 fefeb36..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")
@@ -97,15 +102,22 @@
}
}
- BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
+ /*BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
if (currentValue != null) {
data.forEach(kline -> {
- kline.setOpen(kline.getOpen().add(currentValue));
- kline.setLow(kline.getLow().add(currentValue));
- kline.setHigh(kline.getHigh().add(currentValue));
- kline.setClose(kline.getClose().add(currentValue));
+ *//*logger.info("==currentValue==close:{}, low:{}, high:{}, open:{}, currentValue:{}",
+ kline.getClose(), kline.getLow(), kline.getHigh(), kline.getOpen(), currentValue);*//*
+ if (!kline.isAdjusted()){
+ if (kline.getClose().compareTo(kline.getLow()) >= 0 && kline.getClose().compareTo(kline.getHigh()) <= 0) {
+ kline.setClose(kline.getClose().add(currentValue));
+ }
+ kline.setOpen(kline.getOpen().add(currentValue));
+ kline.setLow(kline.getLow().add(currentValue));
+ kline.setHigh(kline.getHigh().add(currentValue));
+ kline.setAdjusted(true);
+ }
});
- }
+ }*/
return Result.succeed(this.build(data, line, symbol));
} catch (Exception e) {
logger.error("getKline error", e);
@@ -166,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