From 865eeb5d1b4d883ba9a70b64e4f8e3e4d271ce4d Mon Sep 17 00:00:00 2001
From: PC-202403201522\Administrator <1041918560@qq.com>
Date: Mon, 13 May 2024 14:42:43 +0800
Subject: [PATCH] 增加邮箱校验
---
src/main/java/com/nq/service/impl/StockServiceImpl.java | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 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..37428cb 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -1,19 +1,24 @@
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.*;
+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;
@@ -81,6 +86,10 @@
@Resource
StockDzMapper stockDzMapper;
+
+
+ @Autowired
+ IPriceServices iPriceServices;
public ServerResponse getMarket() {
String market_url = PropertiesUtil.getProperty("sina.market.url");
@@ -161,8 +170,12 @@
if (stockList.size() > 0){
stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
}
- PageInfo pageInfo = new PageInfo(stockList);
+ for (int i = 0; i <stockListVOS.size() ; i++) {
+ stockListVOS.get(i).setNowPrice(iPriceServices.getNowPrice(stockListVOS.get(i).getCode()).toString());
+ }
+ RPageInfo pageInfo = new RPageInfo();
pageInfo.setList(stockListVOS);
+ pageInfo.setStockType(stockType);
return ServerResponse.createBySuccess(pageInfo);
}
@@ -244,16 +257,13 @@
Stock stock = stockMapper.findStockByCode(code);
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 map = Maps.newHashMap();
@@ -438,28 +448,65 @@
return ServerResponse.createBySuccess(echartsDataVO);
}
- /*股票日线-K线*/
+ @lombok.Data
+ class kData {
+ long t;
+ String c;
+ String o;
+ String h;
+ String l;
+ String v;
+ String vo;
+ }
+
@Override
public Object getKData(String pid, String interval, String stockType) {
EStockType eStockType = EStockType.getEStockTypeByCode(stockType);
- String string;
- if(eStockType == EStockType.SZHB){
+ 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());
- 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);
+ 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);
- }else{
- string = HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
}
- return string;
+ return HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
+ }
+
+ 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;
}
@Override
@@ -468,41 +515,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) {
--
Gitblit v1.9.3