From bcb620e2b9da85149c464c9909bcdeb5dc56fd3c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Feb 2026 18:31:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 340 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 210 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index bd26147..6567b19 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,19 +1,27 @@
package com.nq.service.impl;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
import com.nq.common.ServerResponse;
import com.nq.config.StockPoll;
import com.nq.dao.*;
import com.nq.enums.EStockType;
import com.nq.pojo.*;
+import com.nq.pojo.reponse.RPageInfo;
import com.nq.service.*;
import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.PropertiesUtil;
+import com.nq.utils.redis.RedisKeyUtil;
import com.nq.utils.redis.RedisShardedPoolUtils;
import com.nq.utils.stock.pinyin.GetPyByChinese;
import com.nq.utils.stock.qq.QqStockApi;
@@ -31,12 +39,17 @@
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;
+import lombok.Data;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -81,6 +94,11 @@
@Resource
StockDzMapper stockDzMapper;
+
+
+ @Autowired
+ IPriceServices iPriceServices;
+
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -161,105 +179,72 @@
if (stockList.size() > 0){
stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
}
- PageInfo pageInfo = new PageInfo(stockList);
+ RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockListVOS);
+ pageInfo.setStockType(stockType);
return ServerResponse.createBySuccess(pageInfo);
}
- public ServerResponse getDateline(HttpServletResponse response, String code) {
- if (StringUtils.isBlank(code))
- return ServerResponse.createByErrorMsg("");
- Stock stock = this.stockMapper.findStockByCode(code);
- if (stock == null)
- return ServerResponse.createByErrorMsg("");
- response.setHeader("Access-Control-Allow-Origin", "*");
- Date time = new Date();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
- String end = sdf.format(time);
- Calendar c = Calendar.getInstance();
- c.setTime(new Date());
- c.add(2, -3);
- Date m = c.getTime();
- String mon = sdf.format(m);
- String methodUrl = "http://q.stock.sohu.com/hisHq?code=cn_" + code + "+&start=" + mon + "&end=" + end + "&stat=1&order=D";
- HttpURLConnection connection = null;
- BufferedReader reader = null;
- String line = null;
- EchartsDataVO echartsDataVO = new EchartsDataVO();
- try {
- URL url = new URL(methodUrl);
- connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
- connection.connect();
- if (connection.getResponseCode() == 200) {
- reader = new BufferedReader(new InputStreamReader(connection.getInputStream(), "gbk"));
- StringBuilder result = new StringBuilder();
- while ((line = reader.readLine()) != null)
- result.append(line).append(System.getProperty("line.separator"));
- JSONArray jsonArray = JSONArray.fromObject(result.toString());
- JSONObject json = jsonArray.getJSONObject(0);
- JSONArray jsonArray1 = JSONArray.fromObject(json.get("hq"));
- Collections.reverse((List<?>) jsonArray1);
- double[][] values = (double[][]) null;
- Object[][] volumes = (Object[][]) null;
- String[] date = null;
- values = new double[jsonArray1.size()][5];
- volumes = new Object[jsonArray1.size()][3];
- date = new String[jsonArray1.size()];
- for (int i = 0; i < jsonArray1.size(); i++) {
- JSONArray js = JSONArray.fromObject(jsonArray1.get(i));
- date[i] = js.get(0).toString();
- values[i][0] = Double.valueOf(js.get(1).toString()).doubleValue();
- values[i][1] = Double.valueOf(js.get(2).toString()).doubleValue();
- values[i][2] = Double.valueOf(js.get(5).toString()).doubleValue();
- values[i][3] = Double.valueOf(js.get(6).toString()).doubleValue();
- values[i][4] = Double.valueOf(js.get(7).toString()).doubleValue();
- volumes[i][0] = Integer.valueOf(i);
- volumes[i][1] = Double.valueOf(js.get(7).toString());
- volumes[i][2] = Integer.valueOf((Double.valueOf(js.get(3).toString()).doubleValue() > 0.0D) ? 1 : -1);
- }
- echartsDataVO.setDate(date);
- echartsDataVO.setValues(values);
- echartsDataVO.setVolumes(volumes);
- echartsDataVO.setStockCode(stock.getStockCode());
- echartsDataVO.setStockName(stock.getStockName());
- ServerResponse.createBySuccess(echartsDataVO);
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- reader.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- connection.disconnect();
- }
- return ServerResponse.createBySuccess(echartsDataVO);
+ @Override
+ public ServerResponse getDateline(HttpServletResponse paramHttpServletResponse, String paramString) {
+ return null;
}
+
public ServerResponse getSingleStock(String code, HttpServletRequest request) {
if (StringUtils.isBlank(code))
return ServerResponse.createByErrorMsg("");
Stock stock = stockMapper.findStockByCode(code);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock);
Integer depositAmt = 0;
String introduction = null;
- String result = null;
- com.alibaba.fastjson2.JSONObject json = null;
-
- String gid = stock.getStockGid();
-
StockVO stockVO = StockApi.assembleInStockVO(stock);
stockVO.setDepositAmt(depositAmt);
+ stockVO.setNowPrice(iPriceServices.getNowPrice(stock.getStockCode()).toString());
stockVO.setType(stock.getStockType());
stockVO.setId(stock.getId().intValue());
stockVO.setCode(stock.getStockCode());
+ 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());
+ }
Map map = Maps.newHashMap();
map.put("introduction", introduction);
map.put("stock", stockVO);
return ServerResponse.createBySuccess(map);
+ }
+
+ public Map getSingleStock(String code) {
+ if (StringUtils.isBlank(code))
+ return null;
+ Stock stock = stockMapper.findStockByCode(code);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock);
+ Integer depositAmt = 0;
+ String introduction = null;
+ StockVO stockVO = StockApi.assembleInStockVO(stock);
+ stockVO.setDepositAmt(depositAmt);
+ stockVO.setNowPrice(iPriceServices.getNowPrice(stock.getStockCode()).toString());
+ stockVO.setType(stock.getStockType());
+ stockVO.setId(stock.getId().intValue());
+ stockVO.setCode(stock.getStockCode());
+ stockVO.setName(stock.getStockName());
+ stockVO.setSpell(stock.getStockSpell());
+ stockVO.setGid(stock.getStockGid().toUpperCase());
+ if(null != cacheBaseStock){
+ stockVO.setOpen_px(cacheBaseStock.getOpen());
+ stockVO.setPreclose_px(cacheBaseStock.getPrevClose());
+ }
+ Map map = Maps.newHashMap();
+ map.put("introduction", introduction);
+ map.put("stock", stockVO);
+ return map;
}
@@ -437,29 +422,158 @@
EchartsDataVO echartsDataVO = StockApi.assembleEchartsDataVO(minDataVO);
return ServerResponse.createBySuccess(echartsDataVO);
}
+ @lombok.Data
+ class kData {
+ long t;
+ String c;
+ String o;
+ String h;
+ String l;
+ String v;
+ String vo;
+ }
- /*股票日线-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);
- String string;
- if(eStockType == EStockType.SZHB){
+ CacheKey cacheKey = new CacheKey(pid, interval, stockType);
+ long currentTime = System.currentTimeMillis();
- if(interval.equals("D")){
- interval = "1day";
- }else if(interval.equals("W")) {
- interval = "1week";
- }else if(interval.equals("M")){
- interval = "1mon";
- }else{
- interval =interval+ "min";
- }
- string = HttpUtil.get(eStockType.stockUrl + "market/history/kline?period="+interval+"&size=600&symbol="+pid);
-
- }else{
- string = HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
+ // 1. 快速检查缓存（无锁）
+ CacheEntry cached = cacheMap.get(cacheKey);
+ if (cached != null && (currentTime - cached.lastExecuteTime) < MIN_INTERVAL_MS) {
+ return cached.result;
}
- return string;
+
+ // 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表示失败
+ }
+ }
+
+ 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
@@ -468,41 +582,7 @@
if (user == null) {
return ServerResponse.createByErrorMsg("Please log in");
}
-
return ServerResponse.createBySuccess();
-// List<Stock> stockList = stockMapper.findOptions(user.getId() + "");
-//// List<Stock> stockList = stockMapper.findOptions("485");
-// List<StockListVO> stockListVOS = Lists.newArrayList();
-// if (stockList.size() > 0)
-// for (Stock stock : stockList) {
-// StockListVO stockListVO = new StockListVO();
-// QueryWrapper<InStockBean> queryWrapper = new QueryWrapper<>();
-// queryWrapper.eq("id", stock.getStockCode());
-// InStockBean inStockBean = inStockMapper.selectOne(queryWrapper);
-// if (inStockBean == null) {
-// continue;
-// }
-// stockListVO.setNowPrice(inStockBean.getLast());
-// stockListVO.setToday_max(inStockBean.getHigh());
-// stockListVO.setToday_min(inStockBean.getLow());
-// stockListVO.setHcrate(BigDecimal.valueOf(Double.parseDouble(inStockBean.getChgPct())));
-// stockListVO.setBusiness_amount(inStockBean.getVolume());
-// stockListVO.setBusiness_balance(inStockBean.getAvgVolume());
-// stockListVO.setPreclose_px(inStockBean.getPrevClose());
-// stockListVO.setOpen_px(inStockBean.getOpen());
-// stockListVO.setName(stock.getStockName());
-// stockListVO.setCode(stock.getStockCode());
-// stockListVO.setSpell(stock.getStockSpell());
-// stockListVO.setGid(stock.getStockGid());
-// BigDecimal day3Rate = (BigDecimal) selectRateByDaysAndStockCode(stock.getStockCode(), 3).getData();
-// stockListVO.setDay3Rate(day3Rate);
-// stockListVO.setStock_plate(stock.getStockPlate());
-// stockListVO.setStock_type(stock.getStockType());
-// stockListVOS.add(stockListVO);
-// }
-// PageInfo pageInfo = new PageInfo(stockList);
-// pageInfo.setList(stockListVOS);
-
}
public ServerResponse<Stock> findStockByName(String name) {
@@ -517,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