1

zj

2024-07-25 096984e49fd4acdf4943375ca9ccb78d9651e0f0

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

@@ -171,12 +171,12 @@
    @Override
    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
        List<Stock> stockList = new ArrayList<>();
        if(stockType.equals(EStockType.IN.getCode())){
        if(stockType.equals("dz")){
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
            stockList.addAll(stockMapper.findStockTypeDz(orderBy,stockType, keyWords));
        }else{
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.IN.getCode(), keyWords));
            stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
        }

        List<StockListVO> stockListVOS = Lists.newArrayList();
@@ -458,25 +458,26 @@
        /*股票日线-K线*/
    @Override
    public Object getKData(String pid, String interval, String stockType) {

        EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
        if(eStockType == EStockType.IN){
            Object object = HttpUtil.get(eStockType.stockUrl + "api/all/getKData.do?pid=" + pid + "&interval=" + interval + "&stockType=in");
            Gson gson = new Gson();
            List<kData> dataList = gson.fromJson(object.toString(), new TypeToken<List<kData>>(){}.getType());

            Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, pid).eq(Stock::getStockType, "IN"));
            BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
            Map singleStock = getSingleStock(stock.getStockCode());
            StockVO stockVO = (StockVO)singleStock.get("stock");
            // 修改 List 中的最后一条数据
            kData lastData = dataList.get(dataList.size() - 1);
            lastData.setC(nowPrice.toString());
            lastData.setO(stockVO.getOpen_px());
            lastData.setH(stockVO.getToday_max());
            lastData.setL(stockVO.getToday_min());
            return gson.toJson(dataList);

        }
//        if(eStockType == EStockType.US){
//            Object object = HttpUtil.get(eStockType.stockUrl + "api/all/getKData.do?pid=" + pid + "&interval=" + interval + "&stockType=in");
//            Gson gson = new Gson();
//            List<kData> dataList = gson.fromJson(object.toString(), new TypeToken<List<kData>>(){}.getType());
//
//            Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, pid).eq(Stock::getStockType, "IN"));
//            BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
//            Map singleStock = getSingleStock(stock.getStockCode());
//            StockVO stockVO = (StockVO)singleStock.get("stock");
//            // 修改 List 中的最后一条数据
//            kData lastData = dataList.get(dataList.size() - 1);
//            lastData.setC(nowPrice.toString());
//            lastData.setO(stockVO.getOpen_px());
//            lastData.setH(stockVO.getToday_max());
//            lastData.setL(stockVO.getToday_min());
//            return gson.toJson(dataList);
//
//        }
        return  HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
    }