From bfcbef7a6bf2eb73bbf7ae84dac49a8f49db1e1c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 08 Jul 2025 14:49:45 +0800
Subject: [PATCH] 修改股票类型

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

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 7142531..283f5ae 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, "MX", Integer.valueOf(0)));
         } else if (stockType.equals("100")) {
             User user = iUserService.getCurrentRefreshUser(request);
             if (user == null) {
@@ -177,23 +177,6 @@
         if (stockList.size() > 0){
             stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
         }
-
-        // Create a list to hold Futures
-        List<CompletableFuture<Void>> futures = new ArrayList<>();
-
-        // Use CompletableFuture to perform asynchronous processing for each stockListVO
-//        for (StockListVO stockListVO : stockListVOS) {
-//            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());
-//            });
-//            futures.add(future);
-//        }
-//
-//        // Wait for all futures to complete
-//        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-
         RPageInfo pageInfo = new RPageInfo();
         pageInfo.setList(stockListVOS);
         pageInfo.setStockType(stockType);
@@ -223,9 +206,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());
@@ -457,7 +440,7 @@
         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, stockType));
         BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
         Map singleStock = getSingleStock(stock.getStockCode());
         StockVO stockVO = (StockVO)singleStock.get("stock");

--
Gitblit v1.9.3