From 6f0c22dd9de33c38bb2c536937026e51b0b91b6e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 06 Nov 2024 17:07:57 +0800
Subject: [PATCH] 谷歌验证码
---
src/main/java/project/futures/internal/FuturesOrderServiceImpl.java | 11 +++++++----
src/main/java/project/web/api/RealtimeController.java | 8 +++++++-
src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java | 12 ++++++++----
3 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java b/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java
index 05cfaaa..e0e8871 100644
--- a/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java
+++ b/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java
@@ -2,9 +2,11 @@
import java.math.RoundingMode;
import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -80,15 +82,17 @@
}
DecimalFormat df_symbol = new DecimalFormat(decimals);
df_symbol.setRoundingMode(RoundingMode.FLOOR);// 向下取整
-
+ TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ sdf.setTimeZone(timeZone);
DecimalFormat df = new DecimalFormat("#.##");
Map<String, Object> map = new HashMap<String, Object>();
map.put("order_no", order.getOrder_no());
map.put("name", item.getName());
map.put("symbol", order.getSymbol());
- map.put("open_time", DateUtils.format(order.getCreate_time(), DateUtils.DF_yyyyMMddHHmmss));
+ map.put("open_time", sdf.format(order.getCreate_time()));
if (order.getClose_time() != null) {
- map.put("close_time", DateUtils.format(order.getClose_time(), DateUtils.DF_yyyyMMddHHmmss));
+ map.put("close_time", sdf.format(order.getClose_time()));
} else {
map.put("close_time", "--");
}
@@ -117,7 +121,7 @@
map.put("volume", order.getVolume());
- map.put("settlement_time", DateUtils.format(order.getSettlement_time(), DateUtils.DF_yyyyMMddHHmmss));// 交割时间
+ map.put("settlement_time", sdf.format(order.getSettlement_time()));// 交割时间
map.put("close_price", df_symbol.format(order.getClose_avg_price()));
map.put("remain_time", StringUtils.isEmptyString(order.getRemain_time()) ? "0:0:0" : order.getRemain_time());
map.put("time_num", order.getTimeNum());
diff --git a/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java b/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java
index c3ee262..5be49bb 100644
--- a/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java
+++ b/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java
@@ -577,15 +577,18 @@
DecimalFormat df_symbol = new DecimalFormat(decimals);
df_symbol.setRoundingMode(RoundingMode.FLOOR);// 向下取整
-
+ TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ sdf.setTimeZone(timeZone);
DecimalFormat df = new DecimalFormat("#.##");
Map<String, Object> map = new HashMap<String, Object>();
map.put("order_no", order.getOrder_no());
map.put("name", item.getName());
map.put("symbol", order.getSymbol());
- map.put("open_time", simpleDateFormat.format(order.getCreate_time()));
+ map.put("open_time", sdf.format(order.getCreate_time()));
if (order.getClose_time() != null) {
- map.put("close_time", DateUtils.format(order.getClose_time(), "yyyy-MM-dd hh:mm:ss"));
+ // 设置时区为纽约的冬令时（Eastern Standard Time, EST）
+ map.put("close_time", sdf.format(order.getClose_time()));
} else {
map.put("close_time", "--");
}
@@ -606,7 +609,7 @@
}
map.put("volume", order.getVolume());
- map.put("settlement_time", simpleDateFormat.format(order.getSettlement_time()));// 交割时间
+ map.put("settlement_time", sdf.format(order.getSettlement_time()));// 交割时间
map.put("close_price", df_symbol.format(order.getClose_avg_price()));
map.put("remain_time", StringUtils.isEmptyString(order.getRemain_time()) ? "0:0:0" : order.getRemain_time());
map.put("time_num", order.getTimeNum());
diff --git a/src/main/java/project/web/api/RealtimeController.java b/src/main/java/project/web/api/RealtimeController.java
index 1eb5cc2..16e7ace 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.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -89,7 +90,12 @@
Map<String, Object> map = new HashMap<String, Object>();
map.put("symbol", realtime.getSymbol());
map.put("ts", realtime.getTs());
- map.put("current_time", realtime.getCurrent_time());
+ String currentTime = realtime.getCurrent_time();
+ // 设置时区为纽约的冬令时（Eastern Standard Time, EST）
+ TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ sdf.setTimeZone(timeZone);
+ map.put("current_time",sdf.format(currentTime));
map.put("name", realtime.getName());
map.put("change_ratio", realtime.getChange_ratio());
Item item = this.itemService.cacheBySymbol(realtime.getSymbol(), true);
--
Gitblit v1.9.3