From c00bbb2f219514005033348b931a140d49579bb8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 27 Aug 2025 18:37:01 +0800
Subject: [PATCH] K线实时刷新
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 129 insertions(+), 48 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..e5ad771 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -17,6 +17,7 @@
import com.nq.service.*;
import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.PropertiesUtil;
+import com.nq.utils.http.HttpRequest;
import com.nq.utils.redis.RedisKeyUtil;
import com.nq.utils.redis.RedisShardedPoolUtils;
import com.nq.utils.stock.pinyin.GetPyByChinese;
@@ -26,10 +27,9 @@
import com.nq.vo.stock.k.MinDataVO;
import com.nq.vo.stock.k.echarts.EchartsDataVO;
+import java.lang.reflect.Type;
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 +509,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");
@@ -704,47 +705,30 @@
List<SiteNews> newsList = this.siteNewsMapper.getTopNewsList(pageSize);
String usCodeList = PropertiesUtil.getProperty("us_home_indices_code");
- String mxCodeList = PropertiesUtil.getProperty("mx_home_indices_code");
- List<String> usStockCodeList = Arrays.asList(usCodeList.split(","));
- List<String> mxStockCodeList = Arrays.asList(mxCodeList.split(","));
+ String hkCodeList = PropertiesUtil.getProperty("hk_home_indices_code");
+ String inCodeList = PropertiesUtil.getProperty("in_home_indices_code");
+ String twCodeList = PropertiesUtil.getProperty("tw_home_indices_code");
+
List<DataStockBean> usDataStockBeans = Lists.newArrayList();
- List<DataStockBean> mxDataStockBeans = Lists.newArrayList();
- for (int i = 0; i < usStockCodeList.size(); i++) {
- String stockCode = usStockCodeList.get(i);
- String stockType = EStockType.US.getCode();
- DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
- // 获取K线数据
- Object kData = RedisKeyUtil.getCaCheStockKData(stockType, stockCode);
- if (kData == null) {
- //重新获取并缓存redis
- kData = getKData(stockCode, "D", stockType);
- RedisKeyUtil.setCaCheStockKData(stockType, stockCode, kData);
- }
- Gson gson = new Gson();
- List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
- cacheBaseStock.setKData(dataList);
- usDataStockBeans.add(cacheBaseStock);
- }
- for (int i = 0; i < mxStockCodeList.size(); i++) {
- String stockCode = mxStockCodeList.get(i);
- String stockType = EStockType.MX.getCode();
- DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
- // 获取K线数据
- Object kData = RedisKeyUtil.getCaCheStockKData(stockType, stockCode);
- if (kData == null) {
- //重新获取并缓存redis
- kData = getKData(stockCode, "D", stockType);
- RedisKeyUtil.setCaCheStockKData(stockType, stockCode, kData);
- }
- Gson gson = new Gson();
- List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
- cacheBaseStock.setKData(dataList);
- mxDataStockBeans.add(cacheBaseStock);
- }
+ List<DataStockBean> hkDataStockBeans = Lists.newArrayList();
+ List<DataStockBean> inDataStockBeans = Lists.newArrayList();
+ List<DataStockBean> twDataStockBeans = Lists.newArrayList();
+ // 创建Gson对象（全局复用，避免重复创建）
+ Gson gson = new Gson();
+
+ // 统一处理各地区股票数据
+ processStockData(usCodeList, EStockType.US.getCode(), usDataStockBeans, gson);
+ processStockData(hkCodeList, EStockType.HK.getCode(), hkDataStockBeans, gson);
+ processStockData(inCodeList, EStockType.IN.getCode(), inDataStockBeans, gson);
+ processStockData(twCodeList, EStockType.TW.getCode(), twDataStockBeans, gson);
+
+ // 组装返回结果
Map<String, Object> resultMap = new HashMap<>();
resultMap.put("newsList", newsList); //新闻列表
resultMap.put("usDataStockBeans", usDataStockBeans);//美国指数
- resultMap.put("mxDataStockBeans", mxDataStockBeans);//墨西哥指数
+ resultMap.put("hkDataStockBeans", hkDataStockBeans);//香港指数
+ resultMap.put("inDataStockBeans", inDataStockBeans);//印度指数
+ resultMap.put("twDataStockBeans", twDataStockBeans);//台湾指数
return ServerResponse.createBySuccess(resultMap);
} catch (Exception e){
e.printStackTrace();
@@ -752,15 +736,61 @@
return ServerResponse.createByError();
}
+ // 提取的通用处理方法
+ private void processStockData(String stockCodes, String stockType,
+ List<DataStockBean> targetList, Gson gson) throws Exception {
+ String[] stockCodeList = stockCodes.split(",");
+ //实时获取数据
+ //String result = RedisKeyUtil.doPost(stockCodes, stockType);
+ EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
+ String result = HttpRequest.doGrabGet(eStockType.stockUrl + "indices?key=" + eStockType.getStockKey() + "&country_id=" + eStockType.getContryId());
+ // 把JSON数据解析为List<DataStockBean>
+ Type listType = new TypeToken<List<DataStockBean>>(){}.getType();
+ List<DataStockBean> list = new Gson().fromJson(result, listType);
+
+ for (String stockCode : stockCodeList) { // 增强for循环简化代码
+ // 获取基础股票数据
+ //DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
+ DataStockBean cacheBaseStock = list.stream()
+ .filter(x -> stockCode.equals(x.getId()))
+ .findFirst().orElse(null);
+ if (cacheBaseStock == null) { // 增加空指针防护（可选，根据实际业务）
+ continue;
+ }
+
+ // 获取K线数据（缓存优先）
+ Object kData = RedisKeyUtil.getCaCheStockKData(stockType, stockCode);
+ if (kData == null) {
+ // 缓存未命中时重新获取并缓存
+ kData = getKData(stockCode, "D", stockType);
+ RedisKeyUtil.setCaCheStockKData(stockType, stockCode, kData);
+ }
+
+ // 解析K线数据并设置到对象
+ List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
+ cacheBaseStock.setKData(dataList);
+ cacheBaseStock.setStockType(stockType);
+
+ // 添加到目标集合
+ targetList.add(cacheBaseStock);
+ }
+ }
+
@Override
public ServerResponse getIndicesList(String stockType) {
try {
String codeList;
- if (stockType.equals(EStockType.US.getCode())) {
+ if(stockType.equals(EStockType.US.getCode())) {
codeList = PropertiesUtil.getProperty("us_home_indices_code");
- } else {
- codeList = PropertiesUtil.getProperty("mx_home_indices_code");
- }
+ } else if(stockType.equals(EStockType.HK.getCode())) {
+ codeList = PropertiesUtil.getProperty("hk_home_indices_code");
+ } else if(stockType.equals(EStockType.IN.getCode())) {
+ codeList = PropertiesUtil.getProperty("in_home_indices_code");
+ } else if(stockType.equals(EStockType.TW.getCode())) {
+ codeList = PropertiesUtil.getProperty("tw_home_indices_code");
+ } else
+ codeList = PropertiesUtil.getProperty("us_home_indices_code");
+
List<String> stockCodeList = Arrays.asList(codeList.split(","));
Map<Integer, Object> resultMap = new HashMap<>();
@@ -783,9 +813,34 @@
@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);
+
+ //实时获取数据
+ String s = RedisKeyUtil.doPost(pid, stockType);
+ Map<String, Object> stringObjectMap = RedisKeyUtil.jsonToMap(s);
+ resultMap.put("id", pid);
+ resultMap.put("stockType", stockType);
+ resultMap.put("name", stock.getStockName());
+ resultMap.put("last", stringObjectMap.get("Last").toString());
+ resultMap.put("chg", stringObjectMap.get("Chg").toString());
+ resultMap.put("chgPct", stringObjectMap.get("ChgPct").toString());
+ // 获取K线数据
+ Object kData = getKData(pid, "D", stockType);
+ Gson gson = new Gson();
+ List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
+ resultMap.put("kData", dataList);
+ return ServerResponse.createBySuccess(resultMap);
+
+ /*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());
@@ -801,10 +856,36 @@
List<kData> dataList = gson.fromJson(kData.toString(), new TypeToken<List<kData>>(){}.getType());
resultMap.put("kData", dataList);
return ServerResponse.createBySuccess(resultMap);
- }
+ }*/
} catch (Exception e){
e.printStackTrace();
}
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