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 | 75 +++++++++++++++++++++++--------------
1 files changed, 47 insertions(+), 28 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 9ec30ce..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
@@ -112,11 +112,11 @@
// 1. 确定时间戳单位（假设ts是毫秒级，若为秒级需用ofEpochSecond()）
Instant instant = Instant.ofEpochMilli(ts);
- // 2. 将时间戳转换为当地时区的日期（指定时区更准确，如Asia/Tokyo）
- LocalDate tsDate = instant.atZone(ZoneId.of("Asia/Tokyo")).toLocalDate();
+ // 2. 将时间戳转换为当地时区的日期（指定时区更准确，如America/New_York）
+ LocalDate tsDate = instant.atZone(ZoneId.of("America/New_York")).toLocalDate();
// 3. 获取“昨天的日期”（当前日期减1天）
- LocalDate yesterday = LocalDate.now(ZoneId.of("Asia/Tokyo")).minusDays(1);
+ LocalDate yesterday = LocalDate.now(ZoneId.of("America/New_York")).minusDays(1);
// 4. 判断是否为昨天
boolean isYesterday = tsDate.equals(yesterday);
@@ -144,46 +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()) {
- // 直接获取当前时间的毫秒级时间戳（系统默认时区，但值是全球统一的）
+ long queryTs = normalizeToMillis(ts);
+ if (beforeClose == null || queryTs > beforeClose.getTs()) {
long currentTimeStamp = System.currentTimeMillis();
-
- // 如果需要严格基于东京时区的当前时间戳（结果和上面一致，因为时间戳是UTC绝对时间）
- //long currentTokyoTimeStamp = Instant.now().atZone(ZoneId.of("Asia/Tokyo")).toInstant().toEpochMilli();
RequestDataHelper.set("symbol", symbol);
QueryWrapper<Realtime> queryWrapper = new QueryWrapper<Realtime>()
- .eq("symbol", symbol) // 直接写数据库字段名（需和表字段一致）
- .ge("ts", ts)
+ .eq("symbol", symbol)
+ .ge("ts", queryTs)
.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(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();
- if (resultMap == null || resultMap.isEmpty()) {
- return beforeClose;
+ beforeClose.setTs(queryTs);
+ if (resultMap != null && !resultMap.isEmpty()) {
+ beforeClose.setMaxClose(convertToBigDecimal(resultMap.get("maxClose")));
+ beforeClose.setMinClose(convertToBigDecimal(resultMap.get("minClose")));
}
- beforeClose.setMaxClose(convertToBigDecimal(resultMap.get("maxClose")));
- beforeClose.setMinClose(convertToBigDecimal(resultMap.get("minClose")));
- beforeClose.setTs(ts);
redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
}
+ mergeRealtimeIntoBeforeClose(beforeClose, realtime, symbol, line);
+ if (!isValidBeforeClose(beforeClose)) {
+ return null;
+ }
+ return 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);
+ private void mergeRealtimeIntoBeforeClose(BeforeClose beforeClose, Realtime realtime, String symbol, String line) {
+ if (realtime == null || realtime.getClose() == null || realtime.getClose().compareTo(BigDecimal.ZERO) <= 0) {
+ return;
+ }
+ BigDecimal close = realtime.getClose();
+ if (!isValidBeforeClose(beforeClose)) {
+ beforeClose.setMaxClose(close);
+ beforeClose.setMinClose(close);
+ } else {
+ if (close.compareTo(beforeClose.getMaxClose()) > 0) {
+ beforeClose.setMaxClose(close);
}
- if (realtime.getClose().compareTo(beforeClose.getMinClose()) < 0) {
- beforeClose.setMinClose(realtime.getClose());
- redisTemplate.opsForValue().set(RedisKeys.REAL_TIME_BEFORE_CLOSE + symbol + line, beforeClose);
+ if (beforeClose.getMinClose().compareTo(BigDecimal.ZERO) <= 0
+ || close.compareTo(beforeClose.getMinClose()) < 0) {
+ beforeClose.setMinClose(close);
}
}
- System.out.println("realtime.getClose():" + realtime.getClose() + "==" + beforeClose);
- 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