From 5a766206055d0268e051e44d9b8b39d411142426 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 16 Jul 2025 15:58:05 +0800
Subject: [PATCH] 修改
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 261 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 212 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index 71aac38..e8e7785 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,13 +1,15 @@
package com.nq.service.impl;
import cn.hutool.http.HttpUtil;
+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.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.*;
@@ -15,29 +17,23 @@
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;
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.function.Function;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,14 +49,8 @@
@Autowired
StockMapper stockMapper;
- @Resource
- RealTimeMapper realTimeMapper;
-
@Autowired
IStockMarketsDayService iStockMarketsDayService;
-
- @Autowired
- StockPoll stockPoll;
@Resource
StockFuturesMapper stockFuturesMapper;
@@ -72,20 +62,17 @@
IUserService iUserService;
@Autowired
- IStockOptionService iStockOptionService;
- @Autowired
ISiteSettingService iSiteSettingService;
-
-
- @Autowired
- InStockMapper inStockMapper;
@Resource
StockDzMapper stockDzMapper;
-
@Autowired
IPriceServices iPriceServices;
+
+ @Autowired
+ SiteNewsMapper siteNewsMapper;
+
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -123,7 +110,7 @@
List<Stock> stockList = new ArrayList<>();
if (stockType.equals("99")) {
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findZtStockListByKeyWords(keyWords, stockPlate, "IN", 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) {
@@ -159,28 +146,26 @@
@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);
+ 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)));
}
- 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);
- 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,6 +178,7 @@
if (StringUtils.isBlank(code))
return ServerResponse.createByErrorMsg("");
Stock stock = stockMapper.findStockByCode(code);
+ DataStockBean cacheBaseStock = RedisKeyUtil.getCacheBaseStock(stock.getStockType(), stock.getStockCode());
Integer depositAmt = 0;
String introduction = null;
StockVO stockVO = StockApi.assembleInStockVO(stock);
@@ -204,10 +190,44 @@
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.getStockType(), stock.getStockCode());
+ 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;
}
@@ -385,15 +405,37 @@
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线*/
+
+ /*股票日线-K线*/
@Override
public Object getKData(String pid, String interval, String stockType) {
EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
- if(eStockType == EStockType.IN){
- return HttpUtil.get(eStockType.stockUrl+"api/all/getKData.do?pid="+pid+"&interval="+interval+"&stockType=in");
- }
- return 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, stockType));
+ 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());
+ return gson.toJson(dataList);
}
@Override
@@ -417,9 +459,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);
@@ -654,4 +696,125 @@
}
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 mxCodeList = PropertiesUtil.getProperty("mx_home_indices_code");
+ List<String> usStockCodeList = Arrays.asList(usCodeList.split(","));
+ List<String> mxStockCodeList = Arrays.asList(mxCodeList.split(","));
+ 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);
+ cacheBaseStock.setStockType(stockType);
+ 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);
+ cacheBaseStock.setStockType(stockType);
+ mxDataStockBeans.add(cacheBaseStock);
+ }
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("newsList", newsList); //新闻列表
+ resultMap.put("usDataStockBeans", usDataStockBeans);//美国指数
+ resultMap.put("mxDataStockBeans", mxDataStockBeans);//墨西哥指数
+ return ServerResponse.createBySuccess(resultMap);
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+ return ServerResponse.createByError();
+ }
+
+ @Override
+ public ServerResponse getIndicesList(String stockType) {
+ try {
+ String codeList;
+ if(stockType.equals(EStockType.MX.getCode()) || stockType.equals("MX")) {
+ codeList = PropertiesUtil.getProperty("mx_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();
+ }
}
--
Gitblit v1.9.3