From 38a92bc8a3eb615ed3a93381e1a24891de45e9f9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 07 Jul 2024 14:02:12 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 88 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 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 bbd090b..09a2504 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -10,6 +10,7 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
import com.nq.common.ServerResponse;
import com.nq.config.StockPoll;
@@ -38,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;
@@ -94,6 +96,7 @@
@Autowired
IPriceServices iPriceServices;
+
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -168,23 +171,29 @@
@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())){
- 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));
- }
-
-
-
+ PageHelper.startPage(pageNum, pageSize);
+ stockList.addAll(stockMapper.findStockByType(orderBy,stockType,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);
@@ -213,6 +222,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());
@@ -221,6 +234,32 @@
map.put("introduction", introduction);
map.put("stock", stockVO);
return ServerResponse.createBySuccess(map);
+ }
+
+ public Map getSingleStock(String code) {
+ if (StringUtils.isBlank(code))
+ return null;
+ Stock stock = stockMapper.findStockByCode(code);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock);
+ Integer depositAmt = 0;
+ String introduction = null;
+ StockVO stockVO = StockApi.assembleInStockVO(stock);
+ stockVO.setDepositAmt(depositAmt);
+ stockVO.setNowPrice(iPriceServices.getNowPrice(stock.getStockCode()).toString());
+ stockVO.setType(stock.getStockType());
+ stockVO.setId(stock.getId().intValue());
+ stockVO.setCode(stock.getStockCode());
+ stockVO.setName(stock.getStockName());
+ stockVO.setSpell(stock.getStockSpell());
+ stockVO.setGid(stock.getStockGid().toUpperCase());
+ if(null != cacheBaseStock){
+ stockVO.setOpen_px(cacheBaseStock.getOpen());
+ stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
+ }
+ Map map = Maps.newHashMap();
+ map.put("introduction", introduction);
+ map.put("stock", stockVO);
+ return map;
}
@@ -401,12 +440,12 @@
@lombok.Data
class kData {
long t;
- BigDecimal c;
- BigDecimal o;
- BigDecimal h;
- BigDecimal l;
- BigDecimal v;
- BigDecimal vo;
+ String c;
+ String o;
+ String h;
+ String l;
+ String v;
+ String vo;
}
@@ -421,9 +460,14 @@
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); // 修改c字段的值
+ lastData.setC(nowPrice.toString());
+ lastData.setO(stockVO.getOpen_px());
+ lastData.setH(stockVO.getToday_max());
+ lastData.setL(stockVO.getToday_min());
return gson.toJson(dataList);
}
@@ -451,9 +495,9 @@
return ServerResponse.createBySuccess(this.stockMapper.selectByPrimaryKey(stockId));
}
- public ServerResponse<PageInfo> listByAdmin(Integer showState, Integer lockState, String code, String name, String stockPlate, String stockType, int pageNum, int pageSize, HttpServletRequest request) {
+ public ServerResponse<PageInfo> listByAdmin(String stockGid,Integer showState, Integer lockState, String code, String name, String stockPlate, String stockType, int pageNum, int pageSize, HttpServletRequest request) {
PageHelper.startPage(pageNum, pageSize);
- List<Stock> stockList = this.stockMapper.listByAdmin(showState, lockState, code, name, stockPlate, stockType);
+ List<Stock> stockList = this.stockMapper.listByAdmin(stockGid,showState, lockState, code, name, stockPlate, stockType);
List<StockAdminListVO> stockAdminListVOS = Lists.newArrayList();
for (Stock stock : stockList) {
StockAdminListVO stockAdminListVO = assembleStockAdminListVO(stock);
--
Gitblit v1.9.3