From 9f6be2cfa10b20223f0da22d22f01a315f58a7bb Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 18 Aug 2025 18:34:02 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 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..a5cc2db 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -40,6 +40,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -134,7 +135,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, "US", Integer.valueOf(0)));
} else if (stockType.equals("100")) {
User user = iUserService.getCurrentRefreshUser(request);
if (user == null) {
@@ -177,26 +178,11 @@
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);
+ pageInfo.setTotal(stockListVOS.size());
+
return ServerResponse.createBySuccess(pageInfo);
}
@@ -223,9 +209,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 +443,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, "US"));
BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
Map singleStock = getSingleStock(stock.getStockCode());
StockVO stockVO = (StockVO)singleStock.get("stock");
@@ -471,6 +457,19 @@
}
@Override
+ public ServerResponse getIndexData() {
+ Object object = HttpUtil.get(EStockType.US.getStockUrl()+"indices?country_id="+EStockType.US.getContryId()+"&key="+EStockType.US.getStockKey());
+ Gson gson = new Gson();
+ List<IndexDateBo> dataList = gson.fromJson(object.toString(), new TypeToken<List<IndexDateBo>>(){}.getType());
+ List<String> targetIds = Arrays.asList("15881", "15882", "15883");
+ List<IndexDateBo> filteredList = dataList.stream()
+ .filter(item -> targetIds.contains(item.getId()))
+ .collect(Collectors.toList());
+ return ServerResponse.createBySuccess(filteredList);
+ }
+
+
+ @Override
public ServerResponse getOptionStock(HttpServletRequest request) {
User user = iUserService.getCurrentRefreshUser(request);
if (user == null) {
--
Gitblit v1.9.3