From c0750bad4e7ab9acdef951d50f67cb488639b4de Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jul 2024 14:44:36 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index f38dd02..3723cc4 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -39,6 +39,7 @@
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -170,23 +171,35 @@
     @Override
     public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
         List<Stock> stockList = new ArrayList<>();
-        if(stockType.equals(EStockType.IN.getCode())){
+        if(stockType.equals(EStockType.JP.getCode())){
             PageHelper.startPage(pageNum, pageSize);
             stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
         }else{
             PageHelper.startPage(pageNum, pageSize);
-            stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.IN.getCode(), keyWords));
+            stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.JP.getCode(), keyWords));
         }
-
-
 
         List<StockListVO> stockListVOS = Lists.newArrayList();
         if (stockList.size() > 0){
             stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
         }
-        for (int i = 0; i <stockListVOS.size() ; i++) {
-            stockListVOS.get(i).setNowPrice(iPriceServices.getNowPrice(stockListVOS.get(i).getCode(),stockType).toString());
+
+        // 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);
@@ -215,6 +228,10 @@
         stockVO.setName(stock.getStockName());
         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());
         if(null != cacheBaseStock){
             stockVO.setOpen_px(cacheBaseStock.getOpen());
             stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
@@ -442,7 +459,7 @@
     @Override
     public Object getKData(String pid, String interval, String stockType) {
         EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
-        if(eStockType == EStockType.IN){
+        if(eStockType == EStockType.JP){
             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());

--
Gitblit v1.9.3