1

zj

2026-01-15 2818327f844e65e1efc398271b7e4ebf9e8d8364

 src/main/java/com/nq/service/impl/StockServiceImpl.java

@@ -2,6 +2,7 @@

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;
@@ -36,6 +37,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -85,6 +87,9 @@

    @Resource
    StockSettingMapper stockSettingMapper;

    @Autowired
    IStockService iStockService;

    public ServerResponse getMarket() {
        String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -167,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);
@@ -913,8 +936,8 @@
    }

    @Override
    public ServerResponse getPremarketStock() {
        try {
    public List<PremarketStockVO> getPremarketStock() {

            List<StockSetting> stockSettings = stockSettingMapper.selectList(new QueryWrapper<>());
            List<PremarketStockVO> resultList = new ArrayList<>();
            
@@ -969,12 +992,7 @@
                    resultList.add(vo);
                }
            }
            
            return ServerResponse.createBySuccess(resultList);
        } catch (Exception e) {
            log.error("getPremarketStock error", e);
            return ServerResponse.createByErrorMsg("查询盘前交易数据失败");
        }
        return resultList;
    }

    /**