1

zj

2025-04-24 c134d6137dff1d4533b12a07f85e44a1d7d57362

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

@@ -46,6 +46,7 @@
import java.time.format.DateTimeFormatter;
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;
@@ -184,7 +185,18 @@
        if (stockList.size() > 0){
            stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
        }
        RPageInfo pageInfo = new RPageInfo();
        RPageInfo<StockListVO> pageInfo = new RPageInfo<StockListVO>();


        if(null != orderBy && orderBy.equals("asc")){
            stockListVOS = stockListVOS.stream().sorted(Comparator.comparing(StockListVO::getHcrate)).collect(Collectors.toList());
        }

        if(null != orderBy && orderBy.equals("desc")){
            stockListVOS = stockListVOS.stream()
                    .sorted(Comparator.comparing(StockListVO::getHcrate).reversed())
                    .collect(Collectors.toList());
        }
        pageInfo.setList(stockListVOS);
        pageInfo.setStockType(stockType);
        return ServerResponse.createBySuccess(pageInfo);
@@ -519,13 +531,13 @@
                if ((key.equals("CRUDE OIL") && fields.length == 7) || (key.equals("GOLD") && fields.length == 5)) {
                    kData kData = new kData();
                    kData.setT(convDate(fields[0],interval));
                    kData.setC(price);
                    kData.setC(fields[4]);
                    kData.setO(fields[1]);
                    kData.setH(fields[2]);
                    kData.setL(fields[3]);
                    if(key.equals("CRUDE OIL")){
                        kData.setV(fields[4]);
                        kData.setVo(fields[5]);
                        kData.setV(fields[5]);
                        kData.setVo(fields[6]);
                    }else{
                        kData.setV("0");
                        kData.setVo("0");
@@ -535,6 +547,7 @@
                }
            }
        }
        kDataList.get(kDataList.size() - 1).setC(price);
        return kDataList;
    }