From 030e1d50c1f643137220f1ecf1d90ce39174204a Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Sat, 30 May 2026 01:58:54 +0800
Subject: [PATCH] 1
---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java | 138 +++++++++++++++++-----------------------------
1 files changed, 51 insertions(+), 87 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..9b42c5b 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
@@ -119,10 +119,10 @@
LocalDate yesterday = LocalDate.now(ZoneId.of("America/New_York")).minusDays(1);
// 4. 判断是否为昨天
- boolean isYesterday = tsDate.equals(yesterday);
- if (isYesterday) {
- return realtime;
- }
+ boolean isYesterday = tsDate.equals(yesterday);
+ if (isYesterday) {
+ return realtime;
+ }
}
// 没缓存重新保存
// 计算当天0点的时间戳（毫秒级）
@@ -146,97 +146,61 @@
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 currentTimeStamp = System.currentTimeMillis();
+ RequestDataHelper.set("symbol", symbol);
+ QueryWrapper<Realtime> queryWrapper = new QueryWrapper<Realtime>()
+ .eq("symbol", symbol)
+ .ge("ts", ts)
+ .le("ts", currentTimeStamp)
+ .select("MAX(close) as maxClose", "MIN(close) as minClose");
+ Map<String, Object> resultMap = realtimeService.getMap(queryWrapper);
+ RequestDataHelper.clear();
+ beforeClose = new BeforeClose();
+ BigDecimal maxClose = extractAggregateValue(resultMap, "maxClose");
+ BigDecimal minClose = extractAggregateValue(resultMap, "minClose");
+ mergeRealtimeIntoBeforeClose(beforeClose, maxClose, minClose, realtime);
+ beforeClose.setTs(ts);
+ redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
+ } else if (realtime != null) {
+ mergeRealtimeIntoBeforeClose(beforeClose, beforeClose.getMaxClose(), beforeClose.getMinClose(), realtime);
redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
}
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;
- }
- 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);
+ private void mergeRealtimeIntoBeforeClose(BeforeClose beforeClose, BigDecimal maxClose, BigDecimal minClose, Realtime realtime) {
+ BigDecimal max = maxClose;
+ BigDecimal min = minClose;
+ if (realtime != null && realtime.getClose() != null) {
+ BigDecimal latest = realtime.getClose();
+ if (max == null || max.compareTo(BigDecimal.ZERO) <= 0) {
+ max = latest;
+ } else {
+ max = max.max(latest);
}
- if (minClose.compareTo(BigDecimal.ZERO) > 0) {
- beforeClose.setMinClose(minClose);
+ if (min == null || min.compareTo(BigDecimal.ZERO) <= 0) {
+ min = latest;
+ } else {
+ min = min.min(latest);
}
}
- return beforeClose;
+ beforeClose.setMaxClose(max == null ? BigDecimal.ZERO : max);
+ beforeClose.setMinClose(min == null ? BigDecimal.ZERO : min);
+ }
+
+ private BigDecimal extractAggregateValue(Map<String, Object> resultMap, String key) {
+ if (resultMap == null || resultMap.isEmpty()) {
+ return null;
+ }
+ if (resultMap.containsKey(key)) {
+ return convertToBigDecimal(resultMap.get(key));
+ }
+ for (Map.Entry<String, Object> entry : resultMap.entrySet()) {
+ if (entry.getKey() != null && entry.getKey().equalsIgnoreCase(key)) {
+ return convertToBigDecimal(entry.getValue());
+ }
+ }
+ return null;
}
// 辅助方法：统一转换为BigDecimal，避免类型错误
--
Gitblit v1.9.3