From c2f8f40b64c1fcdb9c475908556d8275c13644e0 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 30 Sep 2025 18:30:34 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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..8360ac7 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,6 +1,8 @@
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.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;
@@ -9,6 +11,7 @@
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 +24,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
+import java.util.stream.Collectors;
/**
* K线图
@@ -40,13 +44,16 @@
@Autowired
@Qualifier("dataService")
private DataService dataService;
+ @Autowired
+ private IcoService icoService;
@ApiOperation(value = "行情")
@GetMapping(HOBI + "getKline.action")
public Result<List<Map<String, Object>>> getKline(@RequestParam String symbol, @RequestParam String line) {
ResultObject resultObject = new ResultObject();
+ throw new YamiShopBindException("k线图获取失败");
// 1min, 5min, 15min, 30min, 60min, 4hour, 1day, 1mon, 1week
- try {
+ /*try {
if ("1quarter".equalsIgnoreCase(line)) {
line = Kline.PERIOD_QUARTER;
}
@@ -55,6 +62,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) {
@@ -75,7 +100,7 @@
} catch (Exception e) {
logger.error("getKline error", e);
throw new YamiShopBindException("k线图获取失败");
- }
+ }*/
}
private List<Map<String, Object>> build(List<Kline> data, String line, String symbol) {
--
Gitblit v1.9.3