From 677c87ad5b0057a09381cfe023e857229aa770dd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:48:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index a936bc5..93a8c69 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -171,12 +171,12 @@
@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("dz")){
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+ stockList.addAll(stockMapper.findStockTypeDz(orderBy,stockType, keyWords));
}else{
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.IN.getCode(), keyWords));
+ stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
}
List<StockListVO> stockListVOS = Lists.newArrayList();
@@ -188,17 +188,17 @@
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();
+// 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);
@@ -458,25 +458,26 @@
/*股票日线-K线*/
@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");
- 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"));
- BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
- Map singleStock = getSingleStock(stock.getStockCode());
- StockVO stockVO = (StockVO)singleStock.get("stock");
- // 修改 List 中的最后一条数据
- kData lastData = dataList.get(dataList.size() - 1);
- lastData.setC(nowPrice.toString());
- lastData.setO(stockVO.getOpen_px());
- lastData.setH(stockVO.getToday_max());
- lastData.setL(stockVO.getToday_min());
- return gson.toJson(dataList);
-
- }
+// if(eStockType == EStockType.US){
+// 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());
+//
+// Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, pid).eq(Stock::getStockType, "IN"));
+// BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
+// Map singleStock = getSingleStock(stock.getStockCode());
+// StockVO stockVO = (StockVO)singleStock.get("stock");
+// // 修改 List 中的最后一条数据
+// kData lastData = dataList.get(dataList.size() - 1);
+// lastData.setC(nowPrice.toString());
+// lastData.setO(stockVO.getOpen_px());
+// lastData.setH(stockVO.getToday_max());
+// lastData.setL(stockVO.getToday_min());
+// return gson.toJson(dataList);
+//
+// }
return HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
}
--
Gitblit v1.9.3