From 716f77637e6e324fd5865e82039c2c2ee3f94bfa Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 15:53:06 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 97 ++++++++++++++++++++++++++++--------------------
1 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index ed73412..5934291 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,5 +1,7 @@
package com.nq.service.impl;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@@ -32,7 +34,7 @@
import java.lang.reflect.Type;
import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
+import java.math.RoundingMode;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -917,40 +919,62 @@
List<PremarketStockVO> resultList = new ArrayList<>();
Date now = new Date();
- SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm");
- String currentTime = timeFormat.format(now);
for (StockSetting setting : stockSettings) {
String startTime = setting.getStartTime();
String endTime = setting.getEndTime();
- // 判断当前时间是否在交易时间内
- if (isTimeInRange(currentTime, startTime, endTime)) {
- PremarketStockVO vo = new PremarketStockVO();
- vo.setCode(setting.getStockCode());
+ // 判断当前时间是否在交易时间内（startTime和endTime是完整的日期时间格式）
+ if (isTimeInRange(now, startTime, endTime)) {
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", setting.getStockCode()));
+ if (stock == null) {
+ continue; // 股票不存在，跳过
+ }
- // 计算价格
- BigDecimal price;
+ // 先获取真实涨跌幅数据
+ StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
+ if (realTimeStock == null) {
+ continue; // 无法获取真实数据，跳过
+ }
+
+ // 获取真实价格（从Redis获取，不经过StockSetting计算）
+ String s = RedisKeyUtil.doPost(stock.getStockCode(), stock.getStockType());
+ if (s == null) {
+ continue; // 无法获取真实价格，跳过
+ }
+
+ Map<String, Object> stringObjectMap = RedisKeyUtil.jsonToMap(s);
+ BigDecimal realPrice = new BigDecimal(stringObjectMap.get("Last").toString());
+
+ // 计算盘前价格
+ BigDecimal premarketPrice;
if ("0".equals(setting.getType())) {
// type=0: 直接指定价格
- price = new BigDecimal(setting.getPrice());
+ premarketPrice = new BigDecimal(setting.getPrice());
} else {
- // type=1: 百分比调价格，需要获取当前价格
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", setting.getStockCode()));
- if (stock != null) {
- String s = RedisKeyUtil.doPost(stock.getStockCode(), stock.getStockType());
- if (s != null) {
- Map<String, Object> stringObjectMap = RedisKeyUtil.jsonToMap(s);
- BigDecimal currentPrice = new BigDecimal(stringObjectMap.get("Last").toString());
- price = currentPrice.multiply(new BigDecimal(setting.getPrice()));
- } else {
- continue; // 无法获取当前价格，跳过
- }
- } else {
- continue; // 股票不存在，跳过
- }
+ // type=1: 百分比调价格，基于真实价格计算
+ premarketPrice = realPrice.multiply(new BigDecimal(setting.getPrice()));
}
- vo.setPrice(price);
+
+ // 获取前收盘价
+ BigDecimal prevClose = new BigDecimal(realTimeStock.getPc());
+
+ // 基于盘前价格计算涨跌幅 = (盘前价格 - 前收盘价) / 前收盘价
+ BigDecimal hcrate = BigDecimal.ZERO;
+ if (prevClose.compareTo(BigDecimal.ZERO) > 0) {
+ hcrate = premarketPrice.subtract(prevClose)
+ .divide(prevClose, 4, RoundingMode.HALF_UP);
+ }
+
+ // 格式化涨跌幅为带百分号的字符串
+ String hcrateP = hcrate.multiply(new BigDecimal("100"))
+ .setScale(2, RoundingMode.HALF_UP) + "%";
+
+ PremarketStockVO vo = new PremarketStockVO();
+ vo.setCode(setting.getStockCode());
+ vo.setPrice(premarketPrice);
+ vo.setHcrate(hcrate);
+ vo.setHcrateP(hcrateP);
resultList.add(vo);
}
}
@@ -964,25 +988,18 @@
/**
* 判断当前时间是否在指定时间范围内
- * @param currentTime 当前时间，格式：HH:mm
- * @param startTime 开始时间，格式：HH:mm
- * @param endTime 结束时间，格式：HH:mm
+ * @param now 当前时间
+ * @param startTime 开始时间，完整的日期时间格式
+ * @param endTime 结束时间，完整的日期时间格式
* @return
*/
- private boolean isTimeInRange(String currentTime, String startTime, String endTime) {
+ private boolean isTimeInRange(Date now, String startTime, String endTime) {
try {
- java.time.LocalTime current = java.time.LocalTime.parse(currentTime);
- java.time.LocalTime start = java.time.LocalTime.parse(startTime);
- java.time.LocalTime end = java.time.LocalTime.parse(endTime);
+ DateTime start = DateUtil.parseDateTime(startTime);
+ DateTime end = DateUtil.parseDateTime(endTime);
- // 如果结束时间小于或等于开始时间，说明跨天
- if (end.isBefore(start) || end.equals(start)) {
- // 跨天情况：当前时间 >= 开始时间 或 当前时间 <= 结束时间
- return current.isAfter(start) || current.isBefore(end) || current.equals(start) || current.equals(end);
- } else {
- // 正常情况：开始时间 <= 当前时间 <= 结束时间
- return (current.isAfter(start) || current.equals(start)) && (current.isBefore(end) || current.equals(end));
- }
+ // 判断当前时间是否在开始时间和结束时间之间
+ return now.after(start) && now.before(end);
} catch (Exception e) {
log.error("isTimeInRange error", e);
return false;
--
Gitblit v1.9.3