From 7d008bf58373926bbdcf67fa7bcf92510f427fb6 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 27 Mar 2026 16:57:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 177 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 145 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 f38dd02..6567b19 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -39,6 +39,9 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -170,22 +173,11 @@
@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());
}
RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockListVOS);
@@ -215,6 +207,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("ChgPct").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());
@@ -438,29 +434,146 @@
}
- /*股票日线-K线*/
+
+ // 缓存键类，包含三个参数
+ private static class CacheKey {
+ private final String pid;
+ private final String interval;
+ private final String stockType;
+
+ public CacheKey(String pid, String interval, String stockType) {
+ this.pid = pid;
+ this.interval = interval;
+ this.stockType = stockType;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ CacheKey cacheKey = (CacheKey) o;
+ return pid.equals(cacheKey.pid) &&
+ interval.equals(cacheKey.interval) &&
+ stockType.equals(cacheKey.stockType);
+ }
+
+ @Override
+ public int hashCode() {
+ int result = pid.hashCode();
+ result = 31 * result + interval.hashCode();
+ result = 31 * result + stockType.hashCode();
+ return result;
+ }
+
+ @Override
+ public String toString() {
+ return "CacheKey{pid='" + pid + "', interval='" + interval + "', stockType='" + stockType + "'}";
+ }
+ }
+
+ // 缓存条目类
+ private static class CacheEntry {
+ Object result;
+ long lastExecuteTime;
+
+ CacheEntry(Object result, long lastExecuteTime) {
+ this.result = result;
+ this.lastExecuteTime = lastExecuteTime;
+ }
+ }
+
+ // 缓存存储：每个CacheKey对应一个CacheEntry
+ private static final Map<CacheKey, CacheEntry> cacheMap = new ConcurrentHashMap<>();
+
+ // 锁对象存储：每个CacheKey有自己的锁
+ private static final Map<CacheKey, Object> lockMap = new ConcurrentHashMap<>();
+
+ private static final long MIN_INTERVAL_MS = 3000;
+
@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());
+ CacheKey cacheKey = new CacheKey(pid, interval, stockType);
+ long currentTime = System.currentTimeMillis();
- 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());
+ // 1. 快速检查缓存（无锁）
+ CacheEntry cached = cacheMap.get(cacheKey);
+ if (cached != null && (currentTime - cached.lastExecuteTime) < MIN_INTERVAL_MS) {
+ return cached.result;
+ }
+
+ // 2. 获取该缓存键对应的锁
+ Object keyLock = lockMap.computeIfAbsent(cacheKey, k -> new Object());
+
+ // 3. 同步块内再次检查
+ synchronized (keyLock) {
+ currentTime = System.currentTimeMillis();
+ cached = cacheMap.get(cacheKey);
+
+ if (cached != null && (currentTime - cached.lastExecuteTime) < MIN_INTERVAL_MS) {
+ return cached.result;
+ }
+
+ // 4. 获取新数据
+ Object newResult = doGetKData(pid, interval, stockType);
+
+ // 5. 更新缓存
+ if (newResult != null) {
+ cacheMap.put(cacheKey, new CacheEntry(newResult, System.currentTimeMillis()));
+ return newResult;
+ } else if (cached != null) {
+ // 请求失败，返回旧缓存
+ return cached.result;
+ }
+
+ return "{\"error\":\"获取K线数据失败\"}";
+ }
+ }
+
+ private Object doGetKData(String pid, String interval, String stockType) {
+ try {
+ EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
+ String url = eStockType.stockUrl + "kline?pid=" + pid +
+ "&interval=" + interval + "&key=" + eStockType.stockKey;
+
+ Object object = HttpUtil.get(url);
+ Gson gson = new Gson();
+ List<kData> dataList = gson.fromJson(object.toString(),
+ new TypeToken<List<kData>>(){}.getType());
+
+ // 补充实时数据
+ if (dataList != null && !dataList.isEmpty()) {
+ enrichWithRealTimeData(pid, dataList);
+ }
+
return gson.toJson(dataList);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return null; // 返回null表示失败
}
- return HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
+ }
+
+ private void enrichWithRealTimeData(String pid, List<kData> dataList) {
+ try {
+ Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>()
+ .eq(Stock::getStockCode, pid)
+ .eq(Stock::getStockType, "IN"));
+
+ if (stock != null) {
+ BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
+ Map singleStock = getSingleStock(stock.getStockCode());
+ StockVO stockVO = (StockVO)singleStock.get("stock");
+
+ 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());
+ }
+ } catch (Exception e) {
+ // 实时数据获取失败不影响K线数据返回
+ e.printStackTrace();
+ }
}
@Override
@@ -484,9 +597,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