From 5a766206055d0268e051e44d9b8b39d411142426 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 16 Jul 2025 15:58:05 +0800
Subject: [PATCH] 修改
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 7c601bd..e8e7785 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -110,7 +110,7 @@
List<Stock> stockList = new ArrayList<>();
if (stockType.equals("99")) {
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "MX", Integer.valueOf(0)));
+ stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "MEX", Integer.valueOf(0)));
} else if (stockType.equals("100")) {
User user = iUserService.getCurrentRefreshUser(request);
if (user == null) {
@@ -723,6 +723,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 +740,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 +758,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 +785,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());
--
Gitblit v1.9.3