From 31e6203a5bb778ad9d1c599171606c89c8edd3a3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 21 May 2026 15:59:47 +0800
Subject: [PATCH] 1
---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 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 45112bb..d4d05b8 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
@@ -146,46 +146,63 @@
BeforeClose beforeClose = (BeforeClose) redisTemplate.opsForValue().get(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line);
//超出时间重新计算
if (beforeClose == null || ts > beforeClose.getTs()) {
- // 直接获取当前时间的毫秒级时间戳（系统默认时区，但值是全球统一的）
long currentTimeStamp = System.currentTimeMillis();
-
- // 如果需要严格基于东京时区的当前时间戳（结果和上面一致，因为时间戳是UTC绝对时间）
- //long currentTokyoTimeStamp = Instant.now().atZone(ZoneId.of("America/New_York")).toInstant().toEpochMilli();
RequestDataHelper.set("symbol", symbol);
QueryWrapper<Realtime> queryWrapper = new QueryWrapper<Realtime>()
- .eq("symbol", symbol) // 直接写数据库字段名（需和表字段一致）
+ .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");
- // 4. 执行聚合查询，用selectMap接收结果（键值对：maxClose/minClose -> 对应值）
+ .select("MAX(close) as maxClose", "MIN(close) as minClose");
Map<String, Object> resultMap = realtimeService.getMap(queryWrapper);
RequestDataHelper.clear();
beforeClose = new BeforeClose();
- if (resultMap == null || resultMap.isEmpty()) {
- return beforeClose;
- }
- beforeClose.setMaxClose(convertToBigDecimal(resultMap.get("maxClose")));
- beforeClose.setMinClose(convertToBigDecimal(resultMap.get("minClose")));
+ 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);
}
-
-
- if (realtime != null) {
- if (realtime.getClose().compareTo(beforeClose.getMaxClose()) > 0) {
- beforeClose.setMaxClose(realtime.getClose());
- redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
- }
- if (realtime.getClose().compareTo(beforeClose.getMinClose()) < 0) {
- beforeClose.setMinClose(realtime.getClose());
- redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
- }
- }
- System.out.println("realtime.getClose():" + realtime.getClose() + "==" + beforeClose);
return beforeClose;
}
+ 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 (min == null || min.compareTo(BigDecimal.ZERO) <= 0) {
+ min = latest;
+ } else {
+ min = min.min(latest);
+ }
+ }
+ 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，避免类型错误
private BigDecimal convertToBigDecimal(Object value) {
if (value == null) {
--
Gitblit v1.9.3