Merge remote-tracking branch 'origin/ysz' into ysz

zj

2024-09-04 6404cb07e5281cfd901267c4fd560ba89bd5e2fd

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

@@ -134,7 +134,7 @@
        List<Stock> stockList = new ArrayList<>();
        if (stockType.equals("99")) {
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "IN", Integer.valueOf(0)));
            stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "MAS", Integer.valueOf(0)));
        } else if (stockType.equals("100")) {
            User user = iUserService.getCurrentRefreshUser(request);
            if (user == null) {
@@ -171,7 +171,7 @@
    @Override
    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
        List<Stock> stockList = new ArrayList<>();
        if(stockType.equals("dz")){
        if(stockType.equals("DZ")){
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockTypeDz(orderBy,stockType, keyWords));
        }else{
@@ -183,23 +183,6 @@
        if (stockList.size() > 0){
            stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
        }

        // Create a list to hold Futures
        List<CompletableFuture<Void>> futures = new ArrayList<>();

        // Use CompletableFuture to perform asynchronous processing for each stockListVO
//        for (StockListVO stockListVO : stockListVOS) {
//            CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
//                stockListVO.setNowPrice(iPriceServices.getNowPrice(stockListVO.getCode(), stockType).toString());
//                Map<String, Object> newStock = iPriceServices.getNewStock(stockListVO.getCode());
//                stockListVO.setHcrateP(newStock.get("pcp").toString());
//            });
//            futures.add(future);
//        }
//
//        // Wait for all futures to complete
//        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();

        RPageInfo pageInfo = new RPageInfo();
        pageInfo.setList(stockListVOS);
        pageInfo.setStockType(stockType);