From 7f73eadee4c6b73f2c0608254bc9e9b82f023c3d Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 04 Aug 2025 10:31:58 +0800
Subject: [PATCH] 新增分页
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 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 80f6722..cd61cca 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -28,8 +28,6 @@
import java.math.BigDecimal;
import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -509,9 +507,10 @@
// stockListVO.setNowPrice(stockListVO.getNowPrice());
// }
// }
-
- stockAdminListVO.setNowPrice(stockListVO.getNowPrice());
- stockAdminListVO.setHcrate(stockListVO.getHcrate());
+ if (stockListVO != null) {
+ stockAdminListVO.setNowPrice(stockListVO.getNowPrice());
+ stockAdminListVO.setHcrate(stockListVO.getHcrate());
+ }
stockAdminListVO.setSpreadRate(stock.getSpreadRate());
ServerResponse serverResponse = selectRateByDaysAndStockCode(stock.getStockCode(), 3);
BigDecimal day3Rate = new BigDecimal("0");
@@ -723,6 +722,7 @@
Gson gson = new Gson();
List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
cacheBaseStock.setKData(dataList);
+ cacheBaseStock.setStockType(stockType);
usDataStockBeans.add(cacheBaseStock);
}
for (int i = 0; i < mxStockCodeList.size(); i++) {
@@ -739,6 +739,7 @@
Gson gson = new Gson();
List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
cacheBaseStock.setKData(dataList);
+ cacheBaseStock.setStockType(stockType);
mxDataStockBeans.add(cacheBaseStock);
}
Map<String, Object> resultMap = new HashMap<>();
@@ -756,10 +757,10 @@
public ServerResponse getIndicesList(String stockType) {
try {
String codeList;
- if (stockType.equals(EStockType.US.getCode())) {
- codeList = PropertiesUtil.getProperty("us_home_indices_code");
- } else {
+ if(stockType.equals(EStockType.MX.getCode()) || stockType.equals("MX")) {
codeList = PropertiesUtil.getProperty("mx_home_indices_code");
+ } else {
+ codeList = PropertiesUtil.getProperty("us_home_indices_code");
}
List<String> stockCodeList = Arrays.asList(codeList.split(","));
@@ -783,9 +784,17 @@
@Override
public ServerResponse getIndicesAndKData(String pid, String stockType) {
try {
+ Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", pid));
+ if (stock == null) {
+ return ServerResponse.createByErrorMsg("无股票信息");
+ }
+ stockType = stock.getStockType();
Map<String, Object> resultMap = new HashMap<>();
DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, pid);
if (cacheBaseStock != null) {
+ resultMap.put("id", cacheBaseStock.getId());
+ resultMap.put("stockType", stockType);
+ resultMap.put("name", cacheBaseStock.getName());
resultMap.put("last", cacheBaseStock.getLast());
resultMap.put("chg", cacheBaseStock.getChg());
resultMap.put("chgPct", cacheBaseStock.getChgPct());
@@ -807,4 +816,30 @@
}
return ServerResponse.createByError();
}
+
+ /**
+ * 搜索
+ * @param pageNum
+ * @param pageSize
+ * @param keyWords
+ * @return
+ */
+ @Override
+ public ServerResponse getStocksByKeyWords(int pageNum, int pageSize, String keyWords) {
+ try {
+ PageHelper.startPage(pageNum, pageSize);
+ List<StockVOQuery> stocks = stockMapper.findStocksQuery(keyWords);
+ // 获取分页信息
+ PageInfo<StockVOQuery> pageInfo = new PageInfo<>(stocks);
+ if (!pageInfo.getList().isEmpty()) {
+ pageInfo.getList().forEach(stock -> {
+ stock.setNowPrice(iPriceServices.getNowPrice(stock.getStockCode()));
+ });
+ }
+ return ServerResponse.createBySuccess(pageInfo);
+ } catch (Exception e) {
+ log.error("StockAiService getStocksByKeyWords error", e);
+ }
+ return ServerResponse.createByError();
+ }
}
--
Gitblit v1.9.3