From b28a97e1bf66e3279e78f31ce58122427787ceec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 11 Jun 2026 09:44:20 +0800
Subject: [PATCH] 1
---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java | 132 ++++++++++++++++---------------------------
1 files changed, 49 insertions(+), 83 deletions(-)
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java
index bfe29df..eb73aa7 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java
@@ -144,99 +144,65 @@
public BeforeClose getBeforeClose(String symbol, String line, Long ts, Realtime realtime) {
BeforeClose beforeClose = (BeforeClose) redisTemplate.opsForValue().get(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line);
- //超出时间重新计算
- if (beforeClose == null || ts > beforeClose.getTs()) {
- beforeClose = calcBeforeClose(symbol, line, ts);
- if (beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) > 0) {
- redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
- }
- }
-
- if (realtime != null && realtime.getClose() != null) {
- if (beforeClose.getMaxClose() == null || beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) <= 0) {
- beforeClose.setMaxClose(realtime.getClose());
- } else if (realtime.getClose().compareTo(beforeClose.getMaxClose()) > 0) {
- beforeClose.setMaxClose(realtime.getClose());
- }
- if (beforeClose.getMinClose() == null || beforeClose.getMinClose().compareTo(BigDecimal.ZERO) <= 0) {
- beforeClose.setMinClose(realtime.getClose());
- } else if (realtime.getClose().compareTo(beforeClose.getMinClose()) < 0) {
- beforeClose.setMinClose(realtime.getClose());
+ long queryTs = normalizeToMillis(ts);
+ if (beforeClose == null || queryTs > beforeClose.getTs()) {
+ long currentTimeStamp = System.currentTimeMillis();
+ RequestDataHelper.set("symbol", symbol);
+ QueryWrapper<Realtime> queryWrapper = new QueryWrapper<Realtime>()
+ .eq("symbol", symbol)
+ .ge("ts", queryTs)
+ .le("ts", currentTimeStamp)
+ .select("MAX(CAST(close AS DECIMAL(20,8))) as maxClose",
+ "MIN(CAST(close AS DECIMAL(20,8))) as minClose");
+ Map<String, Object> resultMap = realtimeService.getMap(queryWrapper);
+ RequestDataHelper.clear();
+ beforeClose = new BeforeClose();
+ beforeClose.setTs(queryTs);
+ if (resultMap != null && !resultMap.isEmpty()) {
+ beforeClose.setMaxClose(convertToBigDecimal(resultMap.get("maxClose")));
+ beforeClose.setMinClose(convertToBigDecimal(resultMap.get("minClose")));
}
redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
+ }
+
+ mergeRealtimeIntoBeforeClose(beforeClose, realtime, symbol, line);
+ if (!isValidBeforeClose(beforeClose)) {
+ return null;
}
return beforeClose;
}
- private BeforeClose calcBeforeClose(String symbol, String line, Long ts) {
- BeforeClose beforeClose = new BeforeClose();
- beforeClose.setTs(ts);
- int interval = sysparaService.find("data_interval").getInteger() / 1000;
- if (interval <= 0) {
- interval = 1;
+ private void mergeRealtimeIntoBeforeClose(BeforeClose beforeClose, Realtime realtime, String symbol, String line) {
+ if (realtime == null || realtime.getClose() == null || realtime.getClose().compareTo(BigDecimal.ZERO) <= 0) {
+ return;
}
- HighLow highLow = null;
- switch (line) {
- case Kline.PERIOD_1MIN:
- highLow = HighLowHandle.get(symbol, 60 / interval, interval);
- break;
- case Kline.PERIOD_5MIN:
- highLow = HighLowHandle.get(symbol, (60 * 5) / interval, interval);
- break;
- case Kline.PERIOD_15MIN:
- highLow = HighLowHandle.get(symbol, (60 * 15) / interval, interval);
- break;
- case Kline.PERIOD_30MIN:
- highLow = HighLowHandle.get(symbol, (60 * 30) / interval, interval);
- break;
- case Kline.PERIOD_60MIN:
- highLow = HighLowHandle.get(symbol, (60 * 60) / interval, interval);
- break;
- case Kline.PERIOD_4HOUR:
- highLow = HighLowHandle.get(symbol, (60 * 60 * 4) / interval, interval);
- break;
- case Kline.PERIOD_1DAY:
- highLow = HighLowHandle.get(symbol, (60 * 60 * 24) / interval, interval);
- break;
- case Kline.PERIOD_1WEEK:
- highLow = HighLowHandle.getByDay(symbol, 7);
- break;
- case Kline.PERIOD_1MON:
- highLow = HighLowHandle.getByDay(symbol, 30);
- break;
- default:
- break;
- }
- if (highLow != null && highLow.getHigh() != null) {
- beforeClose.setMaxClose(highLow.getHigh());
- }
- if (highLow != null && highLow.getLow() != null) {
- beforeClose.setMinClose(highLow.getLow());
- }
- if (beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) > 0) {
- return beforeClose;
- }
- long currentTimeStamp = System.currentTimeMillis();
- RequestDataHelper.set("symbol", symbol);
- QueryWrapper<Realtime> queryWrapper = new QueryWrapper<Realtime>()
- .eq("symbol", symbol)
- .ge("ts", ts)
- .le("ts", currentTimeStamp)
- .select("MAX(CAST(close AS DECIMAL(10,4))) as maxClose",
- "MIN(CAST(close AS DECIMAL(10,4))) as minClose");
- Map<String, Object> resultMap = realtimeService.getMap(queryWrapper);
- RequestDataHelper.clear();
- if (resultMap != null && !resultMap.isEmpty()) {
- BigDecimal maxClose = convertToBigDecimal(resultMap.get("maxClose"));
- BigDecimal minClose = convertToBigDecimal(resultMap.get("minClose"));
- if (maxClose.compareTo(BigDecimal.ZERO) > 0) {
- beforeClose.setMaxClose(maxClose);
+ BigDecimal close = realtime.getClose();
+ if (!isValidBeforeClose(beforeClose)) {
+ beforeClose.setMaxClose(close);
+ beforeClose.setMinClose(close);
+ } else {
+ if (close.compareTo(beforeClose.getMaxClose()) > 0) {
+ beforeClose.setMaxClose(close);
}
- if (minClose.compareTo(BigDecimal.ZERO) > 0) {
- beforeClose.setMinClose(minClose);
+ if (beforeClose.getMinClose().compareTo(BigDecimal.ZERO) <= 0
+ || close.compareTo(beforeClose.getMinClose()) < 0) {
+ beforeClose.setMinClose(close);
}
}
- return beforeClose;
+ redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
+ }
+
+ private boolean isValidBeforeClose(BeforeClose beforeClose) {
+ return beforeClose != null
+ && beforeClose.getMaxClose() != null && beforeClose.getMaxClose().compareTo(BigDecimal.ZERO) > 0
+ && beforeClose.getMinClose() != null && beforeClose.getMinClose().compareTo(BigDecimal.ZERO) > 0;
+ }
+
+ private long normalizeToMillis(Long ts) {
+ if (ts == null) {
+ return System.currentTimeMillis();
+ }
+ return String.valueOf(ts).length() <= 10 ? ts * 1000 : ts;
}
// 辅助方法：统一转换为BigDecimal，避免类型错误
--
Gitblit v1.9.3