From c0b9a0978838536d21eeb4ab3ae5f29fa0d5dcc9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 05 Jun 2024 15:36:46 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 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 37428cb..40c79f9 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -36,6 +36,8 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -125,7 +127,10 @@
public ServerResponse getStock(int pageNum, int pageSize, String keyWords, String stockPlate, String stockType, HttpServletRequest request) {
List<Stock> stockList = new ArrayList<>();
- if (stockType.equals("99")) {
+ if(null == stockType){
+ PageHelper.startPage(pageNum, pageSize);
+ stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
+ }else if (stockType.equals("99")) {
PageHelper.startPage(pageNum, pageSize);
stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "IN", Integer.valueOf(0)));
} else if (stockType.equals("100")) {
@@ -147,7 +152,7 @@
dzStock.setStockType(stockDz.getStockType());
stockList.add(dzStock);
}
- } else {
+ }else {
PageHelper.startPage(pageNum, pageSize);
stockList.addAll(stockMapper.findStockListByKeyWords(keyWords, stockPlate, stockType, Integer.valueOf(0), pageNum - 1, pageSize));
}
@@ -165,19 +170,33 @@
public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
List<Stock> stockList = new ArrayList<>();
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+ stockList.addAll(stockMapper.findStockByType(orderBy, stockType, keyWords));
List<StockListVO> stockListVOS = Lists.newArrayList();
- if (stockList.size() > 0){
+ 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()).toString());
- }
+
+ // 根据实际情况调整核心线程数和最大线程数
+ int corePoolSize = Runtime.getRuntime().availableProcessors(); // 根据实际情况设置核心线程数（通常为CPU核心数）
+ int maxPoolSize = corePoolSize * 2; // 设置最大线程数为核心线程数的两倍
+ ThreadPoolExecutor executor = new ThreadPoolExecutor(corePoolSize, maxPoolSize, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
+ List<CompletableFuture<Void>> futures = stockListVOS.stream()
+ .map(stockListVO -> CompletableFuture.supplyAsync(() ->
+ iPriceServices.getNowPrice(stockListVO.getCode(), stockType), executor)
+ .thenAcceptAsync(price -> stockListVO.setNowPrice(price.toString()), executor))
+ .collect(Collectors.toList());
+
+ // 等待所有CompletableFuture完成
+ CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+
+
RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockListVOS);
pageInfo.setStockType(stockType);
return ServerResponse.createBySuccess(pageInfo);
}
+
public ServerResponse getDateline(HttpServletResponse response, String code) {
if (StringUtils.isBlank(code))
@@ -259,7 +278,9 @@
String introduction = null;
StockVO stockVO = StockApi.assembleInStockVO(stock);
stockVO.setDepositAmt(depositAmt);
- stockVO.setNowPrice(iPriceServices.getNowPrice(stock.getStockCode()).toString());
+ BigDecimal price = stockDzMapper.getPrice(stock.getStockCode());
+ stockVO.setPrice(price != null ? price.toString() : "0");
+ stockVO.setNowPrice(iPriceServices.getNowPrice(stock.getStockCode(),stock.getStockType()).toString());
stockVO.setType(stock.getStockType());
stockVO.setId(stock.getId().intValue());
stockVO.setCode(stock.getStockCode());
--
Gitblit v1.9.3