1

zj

2024-10-29 57c2b6875b5f026a1432f3209471d6b4503f43fc

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

@@ -172,12 +172,13 @@
    @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.JP.getCode())){
        PageHelper.startPage(pageNum, pageSize);
        if(!stockType.equals("DZ")){
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
        }else{
            PageHelper.startPage(pageNum, pageSize);
            stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.JP.getCode(), keyWords));
            stockList.addAll(stockMapper.findStockTypeDz(orderBy, keyWords));
        }

        List<StockListVO> stockListVOS = Lists.newArrayList();
@@ -222,10 +223,17 @@
        stockVO.setName(stock.getStockName());
        stockVO.setSpell(stock.getStockSpell());
        stockVO.setGid(stock.getStockGid().toUpperCase());

        Map<String, Object> newStock = iPriceServices.getNewStock(stock.getStockCode());
        stockVO.setHcrate(newStock.get("pcp").toString().replaceAll("%", ""));
        stockVO.setToday_max(newStock.get("high").toString());
        stockVO.setToday_min(newStock.get("low").toString());
        if(stock.getStockType().equals("US")){
            stockVO.setHcrate(newStock.get("ChgPct").toString().replaceAll("%", ""));
            stockVO.setToday_max(newStock.get("High").toString());
            stockVO.setToday_min(newStock.get("Low").toString());
        }else{
            stockVO.setHcrate(newStock.get("pcp").toString().replaceAll("%", ""));
            stockVO.setToday_max(newStock.get("high").toString());
            stockVO.setToday_min(newStock.get("low").toString());
        }
        if(null != cacheBaseStock){
            stockVO.setOpen_px(cacheBaseStock.getOpen());
            stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
@@ -492,8 +500,24 @@
            lastData.setL(stockVO.getToday_min());
            return gson.toJson(dataList);

        }else{
            Object object = HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
            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));
            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);
//        return  HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
    }

    @Override