From 05c70aec6fb13c9df2c90f84d9411cafe63570a8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 07 Aug 2025 10:53:50 +0800
Subject: [PATCH] 8.6修改
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 194 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 758c282..ffc26df 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,8 +1,6 @@
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;
@@ -10,10 +8,8 @@
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.*;
@@ -26,28 +22,16 @@
import com.nq.utils.stock.pinyin.GetPyByChinese;
import com.nq.utils.stock.qq.QqStockApi;
import com.nq.utils.stock.sina.StockApi;
-import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.stock.*;
import com.nq.vo.stock.k.MinDataVO;
import com.nq.vo.stock.k.echarts.EchartsDataVO;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.math.BigDecimal;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.concurrent.CompletableFuture;
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;
@@ -63,14 +47,8 @@
@Autowired
StockMapper stockMapper;
- @Resource
- RealTimeMapper realTimeMapper;
-
@Autowired
IStockMarketsDayService iStockMarketsDayService;
-
- @Autowired
- StockPoll stockPoll;
@Resource
StockFuturesMapper stockFuturesMapper;
@@ -82,20 +60,16 @@
IUserService iUserService;
@Autowired
- IStockOptionService iStockOptionService;
- @Autowired
ISiteSettingService iSiteSettingService;
-
-
- @Autowired
- InStockMapper inStockMapper;
@Resource
StockDzMapper stockDzMapper;
-
@Autowired
IPriceServices iPriceServices;
+
+ @Autowired
+ SiteNewsMapper siteNewsMapper;
public ServerResponse getMarket() {
@@ -134,7 +108,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) {
@@ -170,17 +144,26 @@
@Override
public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
- List<Stock> stockList = new ArrayList<>();
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+ List<Stock> stockList = stockMapper.findStockByType(orderBy, stockType, keyWords);
+ // 获取分页信息
+ PageInfo<Stock> pageInfo = new PageInfo<>(stockList);
+
List<StockListVO> stockListVOS = Lists.newArrayList();
- if (stockList.size() > 0){
+ if (stockList.size() > 0) {
stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
}
- RPageInfo pageInfo = new RPageInfo();
- pageInfo.setList(stockListVOS);
- pageInfo.setStockType(stockType);
- return ServerResponse.createBySuccess(pageInfo);
+
+ RPageInfo resultPageInfo = new RPageInfo();
+ resultPageInfo.setList(stockListVOS);
+ resultPageInfo.setStockType(stockType);
+ // 设置分页信息
+ resultPageInfo.setTotal(pageInfo.getTotal());
+ resultPageInfo.setPageNum(pageInfo.getPageNum());
+ resultPageInfo.setPageSize(pageInfo.getPageSize());
+ resultPageInfo.setPages(pageInfo.getPages());
+ resultPageInfo.setHasNextPage(pageInfo.isHasNextPage());
+ return ServerResponse.createBySuccess(resultPageInfo);
}
@Override
@@ -193,7 +176,7 @@
if (StringUtils.isBlank(code))
return ServerResponse.createByErrorMsg("");
Stock stock = stockMapper.findStockByCode(code);
- DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock.getStockType(), stock.getStockCode());
Integer depositAmt = 0;
String introduction = null;
StockVO stockVO = StockApi.assembleInStockVO(stock);
@@ -223,7 +206,7 @@
if (StringUtils.isBlank(code))
return null;
Stock stock = stockMapper.findStockByCode(code);
- DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock.getStockType(), stock.getStockCode());
Integer depositAmt = 0;
String introduction = null;
StockVO stockVO = StockApi.assembleInStockVO(stock);
@@ -440,7 +423,7 @@
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"));
+ Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, pid).eq(Stock::getStockType, stockType));
BigDecimal nowPrice = iPriceServices.getNowPrice(stock.getStockCode());
Map singleStock = getSingleStock(stock.getStockCode());
StockVO stockVO = (StockVO)singleStock.get("stock");
@@ -524,9 +507,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");
@@ -711,4 +695,171 @@
}
return ServerResponse.createBySuccess(pool);
}
+
+ @Override
+ public ServerResponse getIndicesIndexListAndNews(Integer pageSize) {
+ try {
+ //新闻列表
+ List<SiteNews> newsList = this.siteNewsMapper.getTopNewsList(pageSize);
+
+ String usCodeList = PropertiesUtil.getProperty("us_home_indices_code");
+ 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<String> usStockCodeList = Arrays.asList(usCodeList.split(","));
+ List<String> hkStockCodeList = Arrays.asList(hkCodeList.split(","));
+ List<String> inStockCodeList = Arrays.asList(inCodeList.split(","));
+ List<String> twStockCodeList = Arrays.asList(twCodeList.split(","));
+
+ List<DataStockBean> usDataStockBeans = Lists.newArrayList();
+ List<DataStockBean> hkDataStockBeans = Lists.newArrayList();
+ List<DataStockBean> inDataStockBeans = Lists.newArrayList();
+ List<DataStockBean> twDataStockBeans = Lists.newArrayList();
+ // 创建Gson对象（全局复用，避免重复创建）
+ Gson gson = new Gson();
+
+ // 统一处理各地区股票数据
+ processStockData(usStockCodeList, EStockType.US.getCode(), usDataStockBeans, gson);
+ processStockData(hkStockCodeList, EStockType.HK.getCode(), hkDataStockBeans, gson);
+ processStockData(inStockCodeList, EStockType.IN.getCode(), inDataStockBeans, gson);
+ processStockData(twStockCodeList, EStockType.TW.getCode(), twDataStockBeans, gson);
+
+ // 组装返回结果
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("newsList", newsList); //新闻列表
+ resultMap.put("usDataStockBeans", usDataStockBeans);//美国指数
+ resultMap.put("hkDataStockBeans", hkDataStockBeans);//香港指数
+ resultMap.put("inDataStockBeans", inDataStockBeans);//印度指数
+ resultMap.put("twDataStockBeans", twDataStockBeans);//台湾指数
+ return ServerResponse.createBySuccess(resultMap);
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+ return ServerResponse.createByError();
+ }
+
+ // 提取的通用处理方法
+ private void processStockData(List<String> stockCodeList, String stockType,
+ List<DataStockBean> targetList, Gson gson) {
+ for (String stockCode : stockCodeList) { // 增强for循环简化代码
+ // 获取基础股票数据
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
+ 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())) {
+ codeList = PropertiesUtil.getProperty("us_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<>();
+ for (int i = 0; i < stockCodeList.size(); i++) {
+ String stockCode = stockCodeList.get(i);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stockType, stockCode);
+ Map<String, Object> stockInfo = new HashMap<>();
+ stockInfo.put("pid", cacheBaseStock.getId());
+ stockInfo.put("name", cacheBaseStock.getName());
+ stockInfo.put("stockType", stockType);
+ resultMap.put(i+1, stockInfo);
+ }
+ return ServerResponse.createBySuccess(resultMap);
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+ return ServerResponse.createByError();
+ }
+
+ @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());
+ resultMap.put("kData", cacheBaseStock.getChg());
+ // 获取K线数据
+ Object kData = RedisKeyUtil.getCaCheStockKData(stockType, pid);
+ if (kData == null) {
+ //重新获取并缓存redis
+ kData = getKData(pid, "D", stockType);
+ RedisKeyUtil.setCaCheStockKData(stockType, pid, kData);
+ }
+ Gson gson = new Gson();
+ 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