From 74e5a0efcda0eff0f23037c3439ef5405bafe922 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sun, 08 Mar 2026 17:41:26 +0800
Subject: [PATCH] 1
---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/DataDBServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 a0518b9..9ec30ce 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
@@ -142,9 +142,10 @@
return realtime;
}
- public BeforeClose getBeforeClose(String symbol, String line, Long ts) {
+ 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) {
+ //超出时间重新计算
+ if (beforeClose == null || ts > beforeClose.getTs()) {
// 直接获取当前时间的毫秒级时间戳（系统默认时区，但值是全球统一的）
long currentTimeStamp = System.currentTimeMillis();
@@ -155,7 +156,8 @@
.eq("symbol", symbol) // 直接写数据库字段名（需和表字段一致）
.ge("ts", ts)
.le("ts", currentTimeStamp)
- .select("MAX(close) as maxClose", "MIN(close) as minClose");
+ .select("MAX(CAST(close AS DECIMAL(10,4))) as maxClose",
+ "MIN(CAST(close AS DECIMAL(10,4))) as minClose");
// 4. 执行聚合查询，用selectMap接收结果（键值对：maxClose/minClose -> 对应值）
Map<String, Object> resultMap = realtimeService.getMap(queryWrapper);
RequestDataHelper.clear();
@@ -165,8 +167,22 @@
}
beforeClose.setMaxClose(convertToBigDecimal(resultMap.get("maxClose")));
beforeClose.setMinClose(convertToBigDecimal(resultMap.get("minClose")));
- redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose , 10 , TimeUnit.SECONDS);
+ beforeClose.setTs(ts);
+ 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;
}
--
Gitblit v1.9.3