From 1256f9068913160f9893b4382cb408835a54349a Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 03 Mar 2026 16:51:32 +0800
Subject: [PATCH] K线
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 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..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
@@ -1,14 +1,20 @@
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.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.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 +27,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.stream.Collectors;
/**
* K线图
@@ -40,6 +47,11 @@
@Autowired
@Qualifier("dataService")
private DataService dataService;
+ @Autowired
+ private IcoService icoService;
+
+ @Autowired
+ private DataDBService dataDBService;
@ApiOperation(value = "行情")
@GetMapping(HOBI + "getKline.action")
@@ -55,6 +67,24 @@
}
// 数据处理
List<Kline> data = this.dataService.kline(symbol, line);
+ Item item = itemService.findBySymbol(symbol);
+ if (item != null) {
+ if (item.getType().equals(Item.cryptos) && (item.getCurrencyType() != null && item.getCurrencyType() == 1)) {
+ /*QueryWrapper<Ico> iQuery = new QueryWrapper<>();
+ iQuery.eq("symbol", symbol);
+ iQuery.eq("symbol_data", item.getSymbolData());
+ Ico ico = icoService.getOne(iQuery);
+ if (ico != null) {
+ long now = ico.getMarketDate().getTime();*/
+ long now = item.getCreateTimeTs() * 1000;
+ data = data.stream().filter(kline -> kline != null
+ && kline.getTs() != null
+ && kline.getTs() > now)
+ .collect(Collectors.toList());
+ //}
+ }
+ }
+
if ("1day".equals(line) || "5day".equals(line) || "1mon".equals(line) || "1week".equals(line) || "quarter".equalsIgnoreCase(line)
|| "year".equalsIgnoreCase(line)) {
for (Kline datum : data) {
@@ -71,6 +101,23 @@
DateUtils.timeStamp2Date(String.valueOf(datum.getTs()), "MM-dd HH:mm"));
}
}
+
+ /*BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
+ if (currentValue != null) {
+ data.forEach(kline -> {
+ *//*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);
@@ -131,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