From 6ed08e7e6a9ecccbb61d5664301da93bbfff67b6 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 28 Jan 2026 14:29:32 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 163 +++++++++++++++++++++++++++++-------------------------
1 files changed, 87 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index c643a74..5312551 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,5 +1,8 @@
package com.nq.service.impl;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
@@ -33,8 +36,8 @@
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -84,6 +87,9 @@
@Resource
StockSettingMapper stockSettingMapper;
+
+ @Autowired
+ IStockService iStockService;
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -166,6 +172,24 @@
if (stockList.size() > 0) {
stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
}
+
+
+ List<PremarketStockVO> premarketStock = iStockService.getPremarketStock();
+
+ Map<String, PremarketStockVO> stockMap = premarketStock.stream()
+ .collect(Collectors.toMap(
+ PremarketStockVO::getCode,
+ stock -> stock
+ ));
+
+ stockListVOS.forEach(f->{
+ PremarketStockVO p = stockMap.get(f.getCode());
+ if (ObjectUtil.isNotEmpty(p)){
+ f.setNowPrice(p.getPrice().toString());
+ f.setHcrate(p.getHcrate());
+ f.setHcrateP(p.getHcrateP());
+ }
+ });
RPageInfo resultPageInfo = new RPageInfo();
resultPageInfo.setList(stockListVOS);
@@ -912,92 +936,79 @@
}
@Override
- public ServerResponse getPremarketStock() {
- try {
- List<StockSetting> stockSettings = stockSettingMapper.selectList(new QueryWrapper<>());
- 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)) {
- Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", setting.getStockCode()));
- if (stock == 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: 直接指定价格
- premarketPrice = new BigDecimal(setting.getPrice());
- } else {
- // type=1: 百分比调价格，基于真实价格计算
- premarketPrice = realPrice.multiply(new BigDecimal(setting.getPrice()));
- }
-
- // 计算涨跌价格 = 盘前价格 - 真实价格
- BigDecimal chg = premarketPrice.subtract(realPrice);
-
- // 计算涨跌幅 = (盘前价格 - 真实价格) / 真实价格 * 100
- BigDecimal chgPct = BigDecimal.ZERO;
- if (realPrice.compareTo(BigDecimal.ZERO) > 0) {
- chgPct = chg.divide(realPrice, 4, RoundingMode.HALF_UP)
- .multiply(new BigDecimal("100"));
- }
-
- PremarketStockVO vo = new PremarketStockVO();
- vo.setCode(setting.getStockCode());
- vo.setPrice(premarketPrice);
- vo.setChg(chg);
- vo.setChgPct(chgPct);
- resultList.add(vo);
+ public List<PremarketStockVO> getPremarketStock() {
+
+ List<StockSetting> stockSettings = stockSettingMapper.selectList(new QueryWrapper<>());
+ List<PremarketStockVO> resultList = new ArrayList<>();
+
+ Date now = new Date();
+
+ for (StockSetting setting : stockSettings) {
+ String startTime = setting.getStartTime();
+ String endTime = setting.getEndTime();
+
+ // 判断当前时间是否在交易时间内（startTime和endTime是完整的日期时间格式）
+ if (isTimeInRange(now, startTime, endTime)) {
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", setting.getStockCode()));
+ if (stock == null) {
+ continue; // 股票不存在，跳过
}
+
+ // 获取真实数据，用于获取前收盘价(pc)
+ StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
+ if (realTimeStock == null || realTimeStock.getPc() == null) {
+ continue; // 无法获取真实数据，跳过
+ }
+
+ // 获取前收盘价(昨收)
+ BigDecimal prevClose = new BigDecimal(realTimeStock.getPc());
+
+ // 计算盘前价格（根据StockSetting配置）
+ BigDecimal premarketPrice;
+ if ("0".equals(setting.getType())) {
+ // type=0: 直接指定价格
+ premarketPrice = new BigDecimal(setting.getPrice());
+ } else {
+ // type=1: 百分比调价格，基于昨收计算
+ premarketPrice = prevClose.multiply(new BigDecimal(setting.getPrice()));
+ }
+
+ // 根据盘前价格和昨收计算涨跌幅 = (盘前价格 - 昨收) / 昨收
+ 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); // price返回盘前价格
+ vo.setHcrate(hcrate);
+ vo.setHcrateP(hcrateP);
+ resultList.add(vo);
}
-
- return ServerResponse.createBySuccess(resultList);
- } catch (Exception e) {
- log.error("getPremarketStock error", e);
- return ServerResponse.createByErrorMsg("查询盘前交易数据失败");
}
+ return resultList;
}
/**
* 判断当前时间是否在指定时间范围内
- * @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