From d78a33a6707fdd67069e6b1ff09493f3dc83e863 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 02 Sep 2024 18:26:12 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockServiceImpl.java |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 09a2504..7142531 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -453,25 +453,21 @@
     @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());
+        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).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);
+        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);
     }
 
     @Override

--
Gitblit v1.9.3