1

dd

2025-11-04 7f63cc81ceeb02d9fd760709cea7abbce98bd346

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

@@ -26,6 +26,7 @@
import com.nq.utils.stock.pinyin.GetPyByChinese;
import com.nq.utils.stock.qq.QqStockApi;
import com.nq.utils.stock.sina.StockApi;
import com.nq.utils.timeutil.TimeUtil;
import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.stock.*;
import com.nq.vo.stock.k.MinDataVO;
@@ -38,6 +39,7 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
@@ -97,6 +99,9 @@

    @Autowired
    IPriceServices iPriceServices;
    @Autowired
    ITradingHourService tradingHourService;



    public ServerResponse getMarket() {
@@ -169,19 +174,48 @@
        return ServerResponse.createBySuccess(pageInfo);
    }

//    @Override
//    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
//        List<Stock> stockList = new ArrayList<>();
//        PageHelper.startPage(pageNum, pageSize);
//        stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
//        List<StockListVO> stockListVOS = Lists.newArrayList();
//        if (stockList.size() > 0){
//            stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
//        }
//        RPageInfo pageInfo = new RPageInfo();
//        pageInfo.setList(stockListVOS);
//        pageInfo.setStockType(stockType);
//        pageInfo.setTotal(stockListVOS.size());
//
//        return ServerResponse.createBySuccess(pageInfo);
//    }




    @Override
    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
        List<Stock> stockList = new ArrayList<>();
        // 启动分页
        PageHelper.startPage(pageNum, pageSize);
        stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));

        // 查询数据（此时返回的已经是分页后的数据）
        List<Stock> stockList = stockMapper.findStockByType(orderBy, stockType, keyWords);

        // 获取分页信息
        PageInfo<Stock> pageInfo = new PageInfo<>(stockList);

        List<StockListVO> stockListVOS = Lists.newArrayList();
        if (stockList.size() > 0){
        if (stockList.size() > 0) {
            stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
        }
        RPageInfo pageInfo = new RPageInfo();
        pageInfo.setList(stockListVOS);
        pageInfo.setStockType(stockType);
        return ServerResponse.createBySuccess(pageInfo);

        RPageInfo rPageInfo = new RPageInfo();
        rPageInfo.setList(stockListVOS);
        rPageInfo.setStockType(stockType);
        rPageInfo.setTotal(pageInfo.getTotal());  // 使用 PageInfo 中的总条数

        return ServerResponse.createBySuccess(rPageInfo);
    }

    @Override
@@ -214,6 +248,11 @@
            stockVO.setOpen_px(cacheBaseStock.getOpen());
            stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
        }
        if(tradingHourService.isPreMarket(stock.getStockCode())){
            stockVO.setPreMarket(1);
        }else {
            stockVO.setPreMarket(0);
        }
        Map map = Maps.newHashMap();
        map.put("introduction", introduction);
        map.put("stock", stockVO);