From 7f63cc81ceeb02d9fd760709cea7abbce98bd346 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Tue, 04 Nov 2025 00:47:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 154 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 115 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index bbd090b..59c7528 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -10,6 +10,7 @@
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;
@@ -25,6 +26,7 @@
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.timeutil.TimeUtil;
import com.nq.utils.translate.GoogleTranslateUtil;
import com.nq.vo.stock.*;
import com.nq.vo.stock.k.MinDataVO;
@@ -37,7 +39,10 @@
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -94,6 +99,10 @@
@Autowired
IPriceServices iPriceServices;
+ @Autowired
+ ITradingHourService tradingHourService;
+
+
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -131,7 +140,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, "US", Integer.valueOf(0)));
} else if (stockType.equals("100")) {
User user = iUserService.getCurrentRefreshUser(request);
if (user == null) {
@@ -165,30 +174,48 @@
return ServerResponse.createBySuccess(pageInfo);
}
+// @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<StockListVO> stockListVOS = Lists.newArrayList();
+// if (stockList.size() > 0){
+// stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
+// }
+// RPageInfo pageInfo = new RPageInfo();
+// pageInfo.setList(stockListVOS);
+// pageInfo.setStockType(stockType);
+// pageInfo.setTotal(stockListVOS.size());
+//
+// return ServerResponse.createBySuccess(pageInfo);
+// }
+
+
+
+
@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 rPageInfo = new RPageInfo();
+ rPageInfo.setList(stockListVOS);
+ rPageInfo.setStockType(stockType);
+ rPageInfo.setTotal(pageInfo.getTotal()); // 使用 PageInfo 中的总条数
+
+ return ServerResponse.createBySuccess(rPageInfo);
}
@Override
@@ -213,6 +240,41 @@
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());
+ }
+ if(tradingHourService.isPreMarket(stock.getStockCode())){
+ stockVO.setPreMarket(1);
+ }else {
+ stockVO.setPreMarket(0);
+ }
+ 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());
@@ -220,7 +282,7 @@
Map map = Maps.newHashMap();
map.put("introduction", introduction);
map.put("stock", stockVO);
- return ServerResponse.createBySuccess(map);
+ return map;
}
@@ -401,12 +463,12 @@
@lombok.Data
class kData {
long t;
- BigDecimal c;
- BigDecimal o;
- BigDecimal h;
- BigDecimal l;
- BigDecimal v;
- BigDecimal vo;
+ String c;
+ String o;
+ String h;
+ String l;
+ String v;
+ String vo;
}
@@ -414,21 +476,35 @@
@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());
+ 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());
- // 修改 List 中的最后一条数据
- kData lastData = dataList.get(dataList.size() - 1);
- lastData.setC(nowPrice); // 修改c字段的值
- return gson.toJson(dataList);
-
- }
- return HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
+ Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, pid).eq(Stock::getStockType, "US"));
+ 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
+ public ServerResponse getIndexData() {
+ Object object = HttpUtil.get(EStockType.US.getStockUrl()+"indices?country_id="+EStockType.US.getContryId()+"&key="+EStockType.US.getStockKey());
+ Gson gson = new Gson();
+ List<IndexDateBo> dataList = gson.fromJson(object.toString(), new TypeToken<List<IndexDateBo>>(){}.getType());
+ List<String> targetIds = Arrays.asList("15881", "15882", "15883");
+ List<IndexDateBo> filteredList = dataList.stream()
+ .filter(item -> targetIds.contains(item.getId()))
+ .collect(Collectors.toList());
+ return ServerResponse.createBySuccess(filteredList);
+ }
+
@Override
public ServerResponse getOptionStock(HttpServletRequest request) {
@@ -451,9 +527,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