From 2a13fc3d05c012766eb677cb0486e6dcf9ed1bf2 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 29 Aug 2024 18:30:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 90 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 28 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..0e84de3 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;
@@ -38,6 +39,7 @@
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;
@@ -95,6 +97,7 @@
@Autowired
IPriceServices iPriceServices;
+
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
String result = null;
@@ -131,7 +134,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, "MAS", Integer.valueOf(0)));
} else if (stockType.equals("100")) {
User user = iUserService.getCurrentRefreshUser(request);
if (user == null) {
@@ -168,22 +171,17 @@
@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())){
+ if(stockType.equals("DZ")){
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+ stockList.addAll(stockMapper.findStockTypeDz(orderBy,stockType, keyWords));
}else{
PageHelper.startPage(pageNum, pageSize);
- stockList.addAll(stockMapper.findStockTypeDz(orderBy,EStockType.IN.getCode(), keyWords));
+ stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
}
-
-
List<StockListVO> stockListVOS = Lists.newArrayList();
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);
@@ -213,6 +211,10 @@
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("pcp").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());
@@ -221,6 +223,32 @@
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;
}
@@ -401,32 +429,38 @@
@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;
}
/*股票日线-K线*/
@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());
-
- 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);
-
- }
+// if(eStockType == EStockType.US){
+// 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());
+//
+// 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");
+// // 修改 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);
+//
+// }
return HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
}
--
Gitblit v1.9.3