From e46d28b79078df83ed136a0b3ea4f2f425df4f2c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 08 Oct 2024 16:58:52 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/utils/stock/sina/StockApi.java |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/nq/utils/stock/sina/StockApi.java b/src/main/java/com/nq/utils/stock/sina/StockApi.java
index 184aa75..74aaddc 100644
--- a/src/main/java/com/nq/utils/stock/sina/StockApi.java
+++ b/src/main/java/com/nq/utils/stock/sina/StockApi.java
@@ -39,10 +39,12 @@
                 StockRealTimeBean realTimeStock = RedisKeyUtil.getCacheRealTimeStock(stock);
                 StockListVO stockListVO = new StockListVO();
                 stockListVO.setHcrate(new BigDecimal(realTimeStock.getPcp()));
+                stockListVO.setHcrateP(realTimeStock.getPcp()+"%");
                 if(realTimeStock.getPcp().contains("-")){
                     stockListVO.setColor(0);
                 }else{
                     stockListVO.setColor(1);
+                    stockListVO.setHcrateP("+"+realTimeStock.getPcp()+"%");
                 }
                 stockListVO.setNowPrice(realTimeStock.getLast());
                 stockListVO.setToday_max(realTimeStock.getHigh());
@@ -55,7 +57,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);
@@ -81,7 +83,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());
@@ -100,8 +110,6 @@
 
             return null;
         }
-
-
         return stockListVO;
     }
 
@@ -113,17 +121,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());

--
Gitblit v1.9.3