重置账号

zyy

2025-09-19 69a9a663e1adde509f316f8c65522c094debba0a

 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,6 +44,8 @@
    @Autowired
    @Qualifier("dataService")
    private DataService dataService;
    @Autowired
    private IcoService icoService;

    @ApiOperation(value = "行情")
    @GetMapping(HOBI + "getKline.action")
@@ -55,6 +61,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) {