1

dd

2026-05-30 030e1d50c1f643137220f1ecf1d90ce39174204a

 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.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;
@@ -10,6 +11,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.DataCache;
import com.yami.trading.huobi.data.internal.DataDBService;
import com.yami.trading.huobi.data.internal.KlineService;
import com.yami.trading.service.data.DataService;
@@ -121,7 +123,7 @@
            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 obtain the K-line chart");
        }
    }

@@ -179,15 +181,30 @@
            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));
                    }
            if (i == data.size() - 1) {
                BigDecimal periodHigh = high;
                BigDecimal periodLow = low;
                BigDecimal closePrice = close;
                Realtime realtime = DataCache.getLatestRealTime(symbol);
                if (realtime != null && realtime.getClose() != null
                        && realtime.getClose().compareTo(BigDecimal.ZERO) > 0) {
                    closePrice = realtime.getClose();
                    map.put("close", closePrice.setScale(decimal, RoundingMode.HALF_UP));
                }
            //}
                BeforeClose beforeClose = dataDBService.getBeforeClose(kline.getSymbol(), line, ts, realtime);
                if (beforeClose != null
                        && beforeClose.getMaxClose() != null && beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) > 0
                        && beforeClose.getMinClose() != null && beforeClose.getMinClose().compareTo(BigDecimal.ZERO) > 0) {
                    periodHigh = periodHigh.max(beforeClose.getMaxClose());
                    periodLow = periodLow.min(beforeClose.getMinClose());
                }
                if (closePrice != null && closePrice.compareTo(BigDecimal.ZERO) > 0) {
                    periodHigh = periodHigh.max(closePrice);
                    periodLow = periodLow.min(closePrice);
                }
                map.put("high", periodHigh.setScale(decimal, RoundingMode.HALF_UP));
                map.put("low", periodLow.setScale(decimal, RoundingMode.HALF_UP));
            }
            list.add(map);
        }
        return list;