1

dd

2025-12-26 9652bbc4a506f46986e298735b27f281ebf06124

1

 src/main/java/com/nq/service/impl/PriceServicesImpl.java

@@ -33,6 +33,8 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import com.fasterxml.jackson.databind.ObjectMapper;

@Service
@@ -109,39 +111,57 @@
        }
    }

    private static String lastResult = null;
    private static long lastExecuteTime = 0;
    private static class CacheEntry {
        String result;
        long lastExecuteTime;
    }

    private static final Map<String, CacheEntry> cacheMap = new ConcurrentHashMap<>();
    private static final long MIN_INTERVAL_MS = 3000;
    private static final Object cacheLock = new Object();
    private static final Object globalLock = new Object();

    public static String doGet(String pid) {
        long currentTime = System.currentTimeMillis();

        // 第一次快速检查（不加锁）
        if (lastResult != null && (currentTime - lastExecuteTime) < MIN_INTERVAL_MS) {
            return lastResult;
        // 1. 先检查该pid是否有缓存
        CacheEntry entry = cacheMap.get(pid);
        if (entry != null && (currentTime - entry.lastExecuteTime) < MIN_INTERVAL_MS) {
            return entry.result;
        }

        // 同步块内再次检查并执行
        synchronized (cacheLock) {
        // 2. 使用双重检查锁定更新缓存
        synchronized (getLockForPid(pid)) {
            currentTime = System.currentTimeMillis();
            if (lastResult != null && (currentTime - lastExecuteTime) < MIN_INTERVAL_MS) {
                return lastResult;
            entry = cacheMap.get(pid);

            if (entry != null && (currentTime - entry.lastExecuteTime) < MIN_INTERVAL_MS) {
                return entry.result;
            }

            // 执行POST请求
            // 3. 执行实际请求
            String newResult = doActualPost(pid);

            // 更新缓存
            lastResult = newResult;
            lastExecuteTime = System.currentTimeMillis();
            // 4. 更新该pid的缓存
            CacheEntry newEntry = new CacheEntry();
            newEntry.result = newResult;
            newEntry.lastExecuteTime = System.currentTimeMillis();
            cacheMap.put(pid, newEntry);

            return newResult;
        }
    }

    // 为每个pid提供独立的锁对象，避免不同pid间的阻塞
    private static final Map<String, Object> pidLocks = new ConcurrentHashMap<>();

    private static Object getLockForPid(String pid) {
        return pidLocks.computeIfAbsent(pid, k -> new Object());
    }


    private static String doActualPost(String pid) {
        String apiUrl = PropertiesUtil.getProperty("JS_IN_HTTP_URL") + "stock?key=" + PropertiesUtil.getProperty("JS_IN_KEY");
        String apiUrl = PropertiesUtil.getProperty("JS_IN_HTTP_URL") +
                "stock?key=" + PropertiesUtil.getProperty("JS_IN_KEY");

        try {
            URL url = new URL(apiUrl);
@@ -161,7 +181,8 @@
            }

            // 读取响应
            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
            BufferedReader in = new BufferedReader(
                    new InputStreamReader(connection.getInputStream()));
            String inputLine;
            StringBuilder response = new StringBuilder();

@@ -174,9 +195,10 @@

        } catch (Exception e) {
            e.printStackTrace();
            // 返回缓存或错误信息
            if (lastResult != null) {
                return lastResult;
            // 如果请求失败，返回该pid的旧缓存（如果有）
            CacheEntry oldEntry = cacheMap.get(pid);
            if (oldEntry != null && oldEntry.result != null) {
                return oldEntry.result;
            }
            return "{\"error\":\"请求失败:" + e.getMessage() + "\"}";
        }

 src/main/java/com/nq/service/impl/StockServiceImpl.java

@@ -40,6 +40,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -434,33 +435,77 @@

    /*股票日线-K线*/
    // 只需要缓存一个最近返回的Object
    private static Object lastResult = null;
    private static long lastExecuteTime = 0;
    // 缓存键类，用于组合多个参数
    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() {
            return 31 * pid.hashCode() + 13 * interval.hashCode() + stockType.hashCode();
        }
    }

    private static class CacheEntry {
        Object result;
        long lastExecuteTime;
    }

    // 缓存映射：每个CacheKey对应一个CacheEntry
    private static final Map<CacheKey, CacheEntry> cacheMap = new ConcurrentHashMap<>();
    private static final long MIN_INTERVAL_MS = 3000;
    private static final Object cacheLock = new Object();

    // 为每个缓存键提供独立的锁对象
    private static final Map<CacheKey, Object> keyLocks = new ConcurrentHashMap<>();

    @Override
    public Object getKData(String pid, String interval, String stockType) {
        CacheKey cacheKey = new CacheKey(pid, interval, stockType);
        long currentTime = System.currentTimeMillis();

        // 第一次快速检查（不加锁）
        if (lastResult != null && (currentTime - lastExecuteTime) < MIN_INTERVAL_MS) {
            return lastResult;
        // 1. 先快速检查缓存
        CacheEntry entry = cacheMap.get(cacheKey);
        if (entry != null && (currentTime - entry.lastExecuteTime) < MIN_INTERVAL_MS) {
            return entry.result;
        }

        // 同步块内再次检查并更新
        synchronized (cacheLock) {
        // 2. 获取该缓存键对应的锁
        Object lock = keyLocks.computeIfAbsent(cacheKey, k -> new Object());

        // 3. 双重检查锁定
        synchronized (lock) {
            currentTime = System.currentTimeMillis();
            if (lastResult != null && (currentTime - lastExecuteTime) < MIN_INTERVAL_MS) {
                return lastResult;
            entry = cacheMap.get(cacheKey);

            if (entry != null && (currentTime - entry.lastExecuteTime) < MIN_INTERVAL_MS) {
                return entry.result;
            }

            // 获取新数据
            // 4. 获取新数据
            Object newResult = doGetKData(pid, interval, stockType);

            // 更新缓存
            lastResult = newResult;
            lastExecuteTime = System.currentTimeMillis();
            // 5. 更新缓存
            CacheEntry newEntry = new CacheEntry();
            newEntry.result = newResult;
            newEntry.lastExecuteTime = System.currentTimeMillis();
            cacheMap.put(cacheKey, newEntry);

            return newResult;
        }
@@ -468,20 +513,28 @@

    private Object doGetKData(String pid, String interval, String stockType) {
        EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
        Object object = HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
        Object object = HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid +
                "&interval=" + interval + "&key=" + eStockType.stockKey);
        Gson gson = new Gson();
        List<kData> dataList = gson.fromJson(object.toString(), new TypeToken<List<kData>>(){}.getType());

        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");
        Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>()
                .eq(Stock::getStockCode, pid)
                .eq(Stock::getStockType, "IN"));

        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());
        if (stock != null) {
            BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
            Map singleStock = getSingleStock(stock.getStockCode());
            StockVO stockVO = (StockVO)singleStock.get("stock");

            if (dataList != null && !dataList.isEmpty()) {
                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());
            }
        }

        return gson.toJson(dataList);
    }