From 94c5b5696345025561ad11f7afa148bac18f31c1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 18 May 2024 15:18:15 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index e3c87cd..55e2c45 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -134,7 +134,7 @@
         List<Stock> stockList = new ArrayList<>();
         if (stockType.equals("99")) {
             PageHelper.startPage(pageNum, pageSize);
-            stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "IN", Integer.valueOf(0)));
+            stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "MAS", Integer.valueOf(0)));
         } else if (stockType.equals("100")) {
             User user = iUserService.getCurrentRefreshUser(request);
             if (user == null) {
@@ -192,7 +192,7 @@
             CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
                 stockListVO.setNowPrice(iPriceServices.getNowPrice(stockListVO.getCode(), stockType).toString());
                 Map<String, Object> newStock = iPriceServices.getNewStock(stockListVO.getCode());
-                stockListVO.setHcrateP(newStock.get("pcp").toString());
+                stockListVO.setHcrateP(newStock.get("ChgPct").toString());
             });
             futures.add(future);
         }
@@ -229,9 +229,9 @@
         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());
+        stockVO.setHcrate(newStock.get("ChgPct").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());
@@ -459,12 +459,12 @@
     @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");
+        if(eStockType == EStockType.MAS){
+            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"));
+            Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, pid).eq(Stock::getStockType, "MAS"));
             BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
             Map singleStock = getSingleStock(stock.getStockCode());
             StockVO stockVO = (StockVO)singleStock.get("stock");

--
Gitblit v1.9.3