1

zj

2025-08-21 75e9aad73f07263789335a803e067b33c743f80d

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

@@ -40,6 +40,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -168,19 +169,45 @@
        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
@@ -454,6 +481,19 @@
    }

    @Override
    public ServerResponse getIndexData() {
        Object object = HttpUtil.get(EStockType.US.getStockUrl()+"indices?country_id="+EStockType.US.getContryId()+"&key="+EStockType.US.getStockKey());
        Gson gson = new Gson();
        List<IndexDateBo> dataList = gson.fromJson(object.toString(), new TypeToken<List<IndexDateBo>>(){}.getType());
        List<String> targetIds = Arrays.asList("15881", "15882", "15883");
        List<IndexDateBo> filteredList = dataList.stream()
                .filter(item -> targetIds.contains(item.getId()))
                .collect(Collectors.toList());
        return ServerResponse.createBySuccess(filteredList);
    }


    @Override
    public ServerResponse getOptionStock(HttpServletRequest request) {
        User user = iUserService.getCurrentRefreshUser(request);
        if (user == null) {