From 01830e44921b187b448d8cce9c9a46b9ad55af43 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 May 2025 19:48:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bingx' into bingx
---
src/main/java/project/web/api/RealtimeController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/project/web/api/RealtimeController.java b/src/main/java/project/web/api/RealtimeController.java
index 7259138..5530d9e 100644
--- a/src/main/java/project/web/api/RealtimeController.java
+++ b/src/main/java/project/web/api/RealtimeController.java
@@ -2,6 +2,7 @@
import java.math.RoundingMode;
import java.text.DecimalFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -83,7 +84,7 @@
}
}
- private List<Map<String, Object>> revise(List<Realtime> data) {
+ private List<Map<String, Object>> revise(List<Realtime> data) throws ParseException {
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
for (int i = 0; i < data.size(); i++) {
Realtime realtime = data.get(i);
@@ -91,10 +92,11 @@
map.put("symbol", realtime.getSymbol());
map.put("ts", realtime.getTs());
String currentTime = realtime.getCurrent_time();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss a", Locale.ENGLISH);
- // 设置时区为台湾（Asia/Taipei）
- sdf.setTimeZone(TimeZone.getTimeZone("Asia/Taipei"));
- map.put("current_time",sdf.format(currentTime));
+ // 设置时区为纽约的冬令时（Eastern Standard Time, EST）
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
+ Date parsedDate = sdf.parse(currentTime);
+ map.put("current_time",sdf.format(parsedDate));
map.put("name", realtime.getName());
map.put("change_ratio", realtime.getChange_ratio());
Item item = this.itemService.cacheBySymbol(realtime.getSymbol(), true);
--
Gitblit v1.9.3