zj
2026-01-14 fff9ac550c469aafa60ce8f1adff5edd6941f8e1
src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -32,6 +32,8 @@
import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -79,6 +81,9 @@
    @Autowired
    StockConfigMapper stockConfigMapper;
    @Resource
    StockSettingMapper stockSettingMapper;
    public ServerResponse getMarket() {
        String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -720,25 +725,19 @@
                            .like(StockConfig::getCKey, EConfigKey.INDICES.getCode()));
            List<DataStockBean> usDataStockBeans = Lists.newArrayList();
            List<DataStockBean> hkDataStockBeans = Lists.newArrayList();
            List<DataStockBean> inDataStockBeans = Lists.newArrayList();
            List<DataStockBean> twDataStockBeans = Lists.newArrayList();
            List<DataStockBean> jpDataStockBeans = Lists.newArrayList();
            // 创建Gson对象(全局复用,避免重复创建)
            Gson gson = new Gson();
            // 统一处理各地区股票数据
            processStockData(stockConfigList, EStockType.US.getCode(), usDataStockBeans, gson);
            //processStockData(stockConfigList, EStockType.HK.getCode(), hkDataStockBeans, gson);
            processStockData(stockConfigList, EStockType.IN.getCode(), inDataStockBeans, gson);
            //processStockData(stockConfigList, EStockType.TW.getCode(), twDataStockBeans, gson);
            processStockData(stockConfigList, EStockType.JP.getCode(), jpDataStockBeans, gson);
            // 组装返回结果
            Map<String, Object> resultMap = new HashMap<>();
            resultMap.put("newsList", newsList);                //新闻列表
            resultMap.put("usDataStockBeans", usDataStockBeans);//美国指数
            resultMap.put("hkDataStockBeans", hkDataStockBeans);//香港指数
            resultMap.put("inDataStockBeans", inDataStockBeans);//印度指数
            resultMap.put("twDataStockBeans", twDataStockBeans);//台湾指数
            resultMap.put("jpDataStockBeans", jpDataStockBeans);//日本指数
            return ServerResponse.createBySuccess(resultMap);
        } catch (Exception e){
            e.printStackTrace();
@@ -911,4 +910,97 @@
        }
        return ServerResponse.createByError();
    }
    @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);
                }
            }
            return ServerResponse.createBySuccess(resultList);
        } catch (Exception e) {
            log.error("getPremarketStock error", e);
            return ServerResponse.createByErrorMsg("查询盘前交易数据失败");
        }
    }
    /**
     * 判断当前时间是否在指定时间范围内
     * @param currentTime 当前时间,格式:HH:mm
     * @param startTime 开始时间,格式:HH:mm
     * @param endTime 结束时间,格式:HH:mm
     * @return
     */
    private boolean isTimeInRange(String currentTime, 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);
            // 如果结束时间小于或等于开始时间,说明跨天
            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));
            }
        } catch (Exception e) {
            log.error("isTimeInRange error", e);
            return false;
        }
    }
}