Merge remote-tracking branch 'origin/6-29' into 6-29

peternameyakj

2024-07-14 85037c73f8b16f4258a2af354cd162247700ffde

 src/main/java/com/nq/utils/stock/sina/StockApi.java

@@ -38,12 +38,8 @@
                Stock stock = stocks.get(i);
                StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
                StockListVO stockListVO = new StockListVO();

                if(realTimeStock.getPcp().contains("%")){
                    realTimeStock.setPcp(realTimeStock.getPcp()+"%");
                }

                stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
                stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
                if(realTimeStock.getPcp().contains("-")){
                    stockListVO.setColor(0);
                }else{
@@ -60,7 +56,7 @@
                stockListVO.setName(stock.getStockName());
                stockListVO.setCode(stock.getStockCode());
                stockListVO.setSpell(stock.getStockSpell());
                stockListVO.setGid(stock.getStockGid().toUpperCase());
                stockListVO.setGid(stock.getStockGid());
                stockListVO.setStock_plate(stock.getStockPlate());
                stockListVO.setStock_type(stock.getStockType());
                stockListVOs.add(stockListVO);
@@ -86,7 +82,15 @@
        StockListVO stockListVO = new StockListVO();
        try {
            StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
            stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp().replace("%", "")));

            stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
            stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
            if(realTimeStock.getPcp().contains("-")){
                stockListVO.setColor(0);
            }else{
                stockListVO.setColor(1);
            }

            stockListVO.setNowPrice(realTimeStock.getLast());
            stockListVO.setToday_max(realTimeStock.getHigh());
            stockListVO.setToday_min(realTimeStock.getLow());
@@ -105,8 +109,6 @@

            return null;
        }


        return stockListVO;
    }

@@ -118,17 +120,7 @@
        }
        try {
            StockRealTimeBean qhBean = RedisKeyUtil.getCacheRealTimeStock(stock);
            if(!qhBean.getPcp().endsWith("%")){
                stockListVO.setHcrate(qhBean.getPcp()+"%");
            }else{
                stockListVO.setHcrate(qhBean.getPcp());
            }

            if(qhBean.getPcp().startsWith("-")){
                stockListVO.setColor("rgb(208, 75, 100)");
            }else{
                stockListVO.setColor("rgb(3, 173, 143)");
            }
            stockListVO.setHcrate(qhBean.getPcp());
            stockListVO.setNowPrice(qhBean.getLast());
            stockListVO.setToday_max(qhBean.getHigh());
            stockListVO.setToday_min(qhBean.getLow());