Merge branch 'develop' into 'main'
Develop See merge request india/india_market_java!21
This commit is contained in:
guoshuai
@@ -46,7 +46,7 @@ webhook:
|
||||
- ls
|
||||
- apt-get update
|
||||
- apt-get install -y curl
|
||||
- curl --max-time 30 http://46.250.238.241:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
|
||||
- curl --max-time 30 http://149.88.86.7:11113/api/webhook/justpull?project=india_market_java\&setenv_file=alpha.sh\&publish_env=alpha\&shell=deploy-test.sh
|
||||
- echo ">>>>>>Start Deploy Finish<<<<<<"
|
||||
|
||||
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
package cn.stock.market.domain.basic.service;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.math.BigDecimal;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import javax.net.ssl.X509TrustManager;
|
||||
import javax.persistence.EntityExistsException;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.sound.midi.Soundbank;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.text.StrFormatter;
|
||||
import cn.stock.market.dto.model.*;
|
||||
import cn.stock.market.infrastructure.api.EttechchartsApis;
|
||||
import cn.stock.market.infrastructure.api.GrowwInApis;
|
||||
import cn.stock.market.infrastructure.api.TodayApis;
|
||||
import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
|
||||
import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
|
||||
@@ -30,22 +25,11 @@ import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.google.common.base.Stopwatch;
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.Protocol;
|
||||
import okhttp3.Request;
|
||||
import okhttp3.Request.Builder;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import cn.stock.market.infrastructure.db.po.QStockPO;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.client.HttpClient;
|
||||
import org.apache.http.client.methods.HttpGet;
|
||||
import org.apache.http.client.utils.HttpClientUtils;
|
||||
import org.apache.http.impl.client.HttpClients;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
import org.jsoup.Jsoup;
|
||||
import org.jsoup.nodes.Document;
|
||||
import org.jsoup.nodes.Element;
|
||||
import org.jsoup.select.Elements;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.data.domain.Page;
|
||||
import org.springframework.http.HttpEntity;
|
||||
@@ -70,11 +54,6 @@ import cn.stock.market.infrastructure.api.sina.vo.MarketVO;
|
||||
import cn.stock.market.infrastructure.api.sina.vo.MarketVOResult;
|
||||
import cn.stock.market.infrastructure.api.sina.vo.k.MinDataVO;
|
||||
import cn.stock.market.infrastructure.api.sina.vo.k.echarts.EchartsDataVO;
|
||||
import cn.stock.market.utils.GetPyByChinese;
|
||||
import cn.stock.market.utils.HttpClientRequest;
|
||||
import cn.stock.market.utils.PropertiesUtil;
|
||||
import cn.stock.market.utils.ServerResponse;
|
||||
import cn.stock.market.utils.Utils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
@@ -1008,7 +987,17 @@ public class StockService {
|
||||
vo1.setKLine(kine);
|
||||
indexVoList.add(vo1);
|
||||
}catch (Exception e){
|
||||
log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
|
||||
log.error("BToday获取BSESENSEX指数数据异常，异常信息。。。。", e);
|
||||
try {
|
||||
GrowwInApis.requestSenSexData(indexVoList);
|
||||
} catch (Exception e1) {
|
||||
log.error("GrowwIn获取BSESENSEX指数数据异常，异常信息。。。。", e1);
|
||||
try{
|
||||
EttechchartsApis.requestSensexData(indexVoList);
|
||||
} catch (Exception e2) {
|
||||
log.error("Ettechcharts获取BSESENSEX指数数据异常，异常信息。。。。", e2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -1028,7 +1017,17 @@ public class StockService {
|
||||
vo1.setKLine(kine);
|
||||
indexVoList.add(vo1);
|
||||
}catch (Exception e){
|
||||
log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
|
||||
log.error("BToday获取NIFTY50指数数据异常，异常信息。。。。", e);
|
||||
try {
|
||||
GrowwInApis.requestNifty50Data(indexVoList);
|
||||
} catch (Exception e1) {
|
||||
log.error("GrowwIn获取NIFTY50指数数据异常，异常信息。。。。", e1);
|
||||
try{
|
||||
EttechchartsApis.requestNifty50Data(indexVoList);
|
||||
} catch (Exception e2) {
|
||||
log.error("Ettechcharts获取NIFTY50指数数据异常，异常信息。。。。", e2);
|
||||
}
|
||||
}
|
||||
}
|
||||
return ServerResponse.createBySuccess(indexVoList);
|
||||
|
||||
@@ -1069,4 +1068,48 @@ public class StockService {
|
||||
|
||||
}
|
||||
|
||||
public ServerResponse getEttechcharts(){
|
||||
List<IndiaIndexVo> indexVoList = new ArrayList<>();
|
||||
try {
|
||||
//获取详情
|
||||
String indexid = "2365";
|
||||
String exchange = "47";
|
||||
String keyName = "sensex";
|
||||
IndiaIndexVo vo1 = new IndiaIndexVo();
|
||||
JSONObject object = EttechchartsApis.getStockDetail(indexid, exchange,keyName);
|
||||
IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
|
||||
market.setName("BSESENSEX指数");
|
||||
vo1.setIndexVo(market);
|
||||
|
||||
//获取k线图 1min 当天的数据 分钟
|
||||
String scripcode = "SENSEX";
|
||||
List kine = EttechchartsApis.getStockKline(scripcode,exchange);
|
||||
vo1.setKLine(kine);
|
||||
indexVoList.add(vo1);
|
||||
}catch (Exception e){
|
||||
log.info("获取BSESENSEX指数数据异常，异常信息{}。。。。",e.getMessage());
|
||||
}
|
||||
try {
|
||||
//获取详情
|
||||
String indexid = "2369";
|
||||
String exchangeid = "50";
|
||||
String keyName = "nifty";
|
||||
IndiaIndexVo vo1 = new IndiaIndexVo();
|
||||
JSONObject object = EttechchartsApis.getStockDetail(indexid, exchangeid,keyName);
|
||||
IndiaStockVO market = EttechchartsApis.ettechchartsObjToVo(object);
|
||||
market.setName("NIFTY50指数");
|
||||
vo1.setIndexVo(market);
|
||||
|
||||
//获取k线图 1min 当天的数据 分钟
|
||||
String scripcode = "NSE+Index";
|
||||
List kine = EttechchartsApis.getStockKline(scripcode,exchangeid);
|
||||
vo1.setKLine(kine);
|
||||
indexVoList.add(vo1);
|
||||
}catch (Exception e){
|
||||
log.info("获取NIFTY50指数数据异常，异常信息{}。。。。",e.getMessage());
|
||||
}
|
||||
return ServerResponse.createBySuccess(indexVoList);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
@@ -0,0 +1,233 @@
|
||||
package cn.stock.market.infrastructure.api;
|
||||
|
||||
import cn.stock.market.dto.TodayStockDTO;
|
||||
import cn.stock.market.infrastructure.api.investing.IndiaIndexVo;
|
||||
import cn.stock.market.infrastructure.api.investing.IndiaStockVO;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.client.config.RequestConfig;
|
||||
import org.apache.http.client.methods.CloseableHttpResponse;
|
||||
import org.apache.http.client.methods.HttpGet;
|
||||
import org.apache.http.impl.client.CloseableHttpClient;
|
||||
import org.apache.http.impl.client.HttpClients;
|
||||
import org.apache.http.util.EntityUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 数据来源网站：<a href="https://groww.in/indices/nifty">...</a>, <a href="https://groww.in/indices/sp-bse-sensex">...</a>
|
||||
*
|
||||
* @auther jnerh
|
||||
*/
|
||||
public class GrowwInApis {
|
||||
|
||||
public static final String INDEX_DETAIL_URL = "https://groww.in/v1/api/stocks_data/v1/accord_points/exchange/%s/segment/CASH/latest_indices_ohlc/%s";
|
||||
public static final String INDEX_KLINE_URL = "https://groww.in/v1/api/charting_service/v2/chart/delayed/exchange/%s/segment/CASH/%s/daily?intervalInMinutes=%s&minimal=true";
|
||||
|
||||
|
||||
public static void requestSenSexData(List<IndiaIndexVo> indexVoList) {
|
||||
IndiaIndexVo vo1 = new IndiaIndexVo();
|
||||
JSONObject object = GrowwInApis.getSenSexDetail();
|
||||
IndiaStockVO market = GrowwInApis.objToVo(object);
|
||||
market.setName("BSESENSEX指数");
|
||||
vo1.setIndexVo(market);
|
||||
|
||||
List kine = GrowwInApis.getSenSexKline();
|
||||
vo1.setKLine(kine);
|
||||
indexVoList.add(vo1);
|
||||
}
|
||||
public static void requestNifty50Data(List<IndiaIndexVo> indexVoList) {
|
||||
IndiaIndexVo vo1 = new IndiaIndexVo();
|
||||
JSONObject object = GrowwInApis.getNifty50Detail();
|
||||
IndiaStockVO market = GrowwInApis.objToVo(object);
|
||||
market.setName("NIFTY50指数");
|
||||
vo1.setIndexVo(market);
|
||||
|
||||
List kine = GrowwInApis.getNifty50Kline();
|
||||
vo1.setKLine(kine);
|
||||
indexVoList.add(vo1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取Nifty50指数详情
|
||||
*/
|
||||
public static JSONObject getIndexDetail(String exchange, String type) {
|
||||
String url = String.format(INDEX_DETAIL_URL, exchange, type);
|
||||
String str = get(url);
|
||||
return JSON.parseObject(str);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取k线图
|
||||
*/
|
||||
public static List getIndexKline(String exchange, String type, String intervalInMinutes) {
|
||||
String url = String.format(INDEX_KLINE_URL, exchange, type, intervalInMinutes);
|
||||
String str = get(url);
|
||||
JSONObject object = JSON.parseObject(str);
|
||||
return getList(object.getString("candles"));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取Nifty50指数详情
|
||||
*/
|
||||
public static JSONObject getSenSexDetail() {
|
||||
return getIndexDetail("BSE", "1");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取k线图
|
||||
*/
|
||||
public static List getSenSexKline() {
|
||||
return getIndexKline("BSE", "1", "1");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取Nifty50指数详情
|
||||
*/
|
||||
public static JSONObject getNifty50Detail() {
|
||||
return getIndexDetail("NSE", "NIFTY");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取k线图
|
||||
*/
|
||||
public static List getNifty50Kline() {
|
||||
return getIndexKline("NSE", "NIFTY", "5");
|
||||
}
|
||||
|
||||
static String get(String url) {
|
||||
CloseableHttpClient httpClient = null;
|
||||
CloseableHttpResponse response = null;
|
||||
String result = "";
|
||||
|
||||
try {
|
||||
httpClient = HttpClients.createDefault();
|
||||
HttpGet httpGet = new HttpGet(url);
|
||||
httpGet.setHeader("Referer", "https://groww.in/indices/nifty");
|
||||
httpGet.setHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Edg/121.0.0.0");
|
||||
httpGet.setHeader("X-App-Id", "growwWeb");
|
||||
httpGet.setHeader("X-Device-Id", "fd4815a2-49e4-570a-931a-0316d4d8a52d");
|
||||
httpGet.setHeader("X-Device-Type", "desktop");
|
||||
httpGet.setHeader("X-Platform", "web");
|
||||
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
|
||||
httpGet.setConfig(requestConfig);
|
||||
response = httpClient.execute(httpGet);
|
||||
HttpEntity entity = response.getEntity();
|
||||
result = EntityUtils.toString(entity);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
|
||||
if (null != response) {
|
||||
try {
|
||||
response.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
if (null != httpClient) {
|
||||
try {
|
||||
httpClient.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static IndiaStockVO objToVo(JSONObject object) {
|
||||
IndiaStockVO market = new IndiaStockVO();
|
||||
if (object.containsKey("close")) {
|
||||
market.setClose(object.getString("close"));
|
||||
}
|
||||
if (object.containsKey("value")) {
|
||||
market.setNowPrice(object.getString("value"));
|
||||
}
|
||||
if (object.containsKey("dayChangePerc")) {
|
||||
market.setRate(object.getString("dayChangePerc"));
|
||||
}
|
||||
if (object.containsKey("high")) {
|
||||
market.setHigh(object.getString("high"));
|
||||
}
|
||||
if (object.containsKey("low")) {
|
||||
market.setLow(object.getString("low"));
|
||||
}
|
||||
if (object.containsKey("open")) {
|
||||
market.setOpen(object.getString("open"));
|
||||
}
|
||||
|
||||
return market;
|
||||
}
|
||||
|
||||
private static List getList(String json) {
|
||||
List<JSONObject> dataObject = new ArrayList<>();
|
||||
JSONArray jsonArray = JSON.parseArray(json);
|
||||
for (Object obj : jsonArray) {
|
||||
JSONObject entity = new JSONObject();
|
||||
JSONArray jsonArray1 = JSON.parseArray(obj.toString());
|
||||
entity.put("upd_date", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(JSON.parseArray(obj.toString()).getLong(0) * 1000)).replace(" ", "T"));
|
||||
entity.put("price", jsonArray1.getBigDecimal(1));
|
||||
dataObject.add(entity);
|
||||
}
|
||||
return dataObject;
|
||||
}
|
||||
|
||||
private static TodayStockDTO todayStockDTO(JSONObject jsonObject) {
|
||||
TodayStockDTO dto = new TodayStockDTO();
|
||||
if (jsonObject.containsKey("exchange")) {
|
||||
dto.setStockType(jsonObject.getString("exchange"));
|
||||
} else {
|
||||
dto.setStockType("");
|
||||
}
|
||||
if (jsonObject.containsKey("lname")) {
|
||||
dto.setStockName(jsonObject.getString("lname"));
|
||||
} else {
|
||||
dto.setStockName("");
|
||||
}
|
||||
if (jsonObject.containsKey("high_price")) {
|
||||
dto.setHighPrice(jsonObject.getString("highPrice"));
|
||||
} else {
|
||||
dto.setHighPrice("0.00");
|
||||
}
|
||||
if (jsonObject.containsKey("low_price")) {
|
||||
dto.setLowPrice(jsonObject.getString("low_price"));
|
||||
} else {
|
||||
dto.setLowPrice("0.00");
|
||||
}
|
||||
if (jsonObject.containsKey("price")) {
|
||||
dto.setLastPrice(jsonObject.getString("price"));
|
||||
} else {
|
||||
dto.setLastPrice("0.00");
|
||||
}
|
||||
if (jsonObject.containsKey("close_price")) {
|
||||
dto.setPrevClosePrice(jsonObject.getString("close_price"));
|
||||
} else {
|
||||
dto.setPrevClosePrice("0.00");
|
||||
}
|
||||
if (jsonObject.containsKey("netchg")) {
|
||||
dto.setChange(jsonObject.getString("netchg"));
|
||||
} else {
|
||||
dto.setChange("0.00");
|
||||
}
|
||||
if (jsonObject.containsKey("perchg")) {
|
||||
dto.setChangePercent(jsonObject.getString("perchg"));
|
||||
} else {
|
||||
dto.setChangePercent("0.00");
|
||||
}
|
||||
return dto;
|
||||
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println(getNifty50Detail());
|
||||
System.out.println(getNifty50Kline());
|
||||
}
|
||||
}
|
||||
@@ -212,6 +212,59 @@ public class HttpClientRequest {
|
||||
return result;
|
||||
}
|
||||
|
||||
public static String doEttechchartsGet(String url) {
|
||||
CloseableHttpClient httpClient = null;
|
||||
CloseableHttpResponse response = null;
|
||||
String result = "";
|
||||
|
||||
try {
|
||||
httpClient = HttpClients.createDefault();
|
||||
|
||||
HttpGet httpGet = new HttpGet(url);
|
||||
|
||||
// httpGet.setHeader(":authority","ettechcharts.indiatimes.com");
|
||||
// httpGet.setHeader(":method","GET");
|
||||
// httpGet.setHeader(":scheme","https");
|
||||
httpGet.setHeader("accept","*/*");
|
||||
httpGet.setHeader("accept-encoding","gzip, deflate, br");
|
||||
httpGet.setHeader("accept-language","zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6");
|
||||
httpGet.setHeader("user-agent","Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36");
|
||||
httpGet.setHeader("Referer", "https://economictimes.indiatimes.com/");
|
||||
|
||||
|
||||
RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(35000).setConnectionRequestTimeout(35000).setSocketTimeout(60000).build();
|
||||
|
||||
httpGet.setConfig(requestConfig);
|
||||
|
||||
response = httpClient.execute(httpGet);
|
||||
|
||||
HttpEntity entity = response.getEntity();
|
||||
|
||||
result = EntityUtils.toString(entity);
|
||||
} catch (ClientProtocolException e) {
|
||||
e.printStackTrace();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
} finally {
|
||||
|
||||
if (null != response) {
|
||||
try {
|
||||
response.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
if (null != httpClient) {
|
||||
try {
|
||||
httpClient.close();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
String url = "https://marketapi.intoday.in/widget/topgainer/view?exchange=nse";
|
||||
String str = doGet(url);
|
||||
|
||||
@@ -65,6 +65,50 @@ public class RequestCacheUtils {
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据时间创建缓存
|
||||
* @param key key
|
||||
* @param duration 时间(毫秒)
|
||||
* @return
|
||||
*/
|
||||
public static Cache<String, ServerResponse<?>> cacheByMilliseconds(String key,long duration) {
|
||||
if(! map.containsKey(key)) {
|
||||
log.info("创建缓存: {}", key);
|
||||
Cache<String, ServerResponse<?>> cache = CacheBuilder.newBuilder()
|
||||
.maximumSize(1000)
|
||||
.expireAfterWrite(duration,TimeUnit.MILLISECONDS)
|
||||
.weakValues()
|
||||
.recordStats()
|
||||
.build(
|
||||
// new CacheLoader<String, Object>() {
|
||||
// @Override
|
||||
// public Object load(String key) throws Exception {
|
||||
// return func.apply(key);
|
||||
// }
|
||||
// }
|
||||
);
|
||||
map.put(key, cache);
|
||||
}
|
||||
|
||||
return map.get(key);
|
||||
}
|
||||
|
||||
@SneakyThrows
|
||||
public static <T> ServerResponse<T> cache(String module, String key,long duration, Function<String, ServerResponse<?>> func) {
|
||||
Cache<String, ServerResponse<?>> cache = cacheByMilliseconds(module,duration);
|
||||
AtomicBoolean bool = new AtomicBoolean(true);
|
||||
ServerResponse<T> response = (ServerResponse<T>) cache.get(key, () -> {
|
||||
bool.set(false);
|
||||
return func.apply(key);
|
||||
});
|
||||
|
||||
if(bool.get()) {
|
||||
log.info("命中缓存 module: {}, key: {}, 时间戳: {}", module, key, System.currentTimeMillis());
|
||||
}
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws InterruptedException {
|
||||
ServerResponse<Object> response = null;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package cn.stock.market.web;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.stock.market.MoneyStockSuggestDTO;
|
||||
import cn.stock.market.domain.basic.entity.MoneyStock;
|
||||
import cn.stock.market.domain.basic.repository.MoneyStockRepository;
|
||||
@@ -37,10 +38,11 @@ import org.springframework.web.client.RestClientException;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@@ -525,8 +527,10 @@ public class MoneyApiController {
|
||||
} else if (StringUtils.equals(stockType, "bse")) {
|
||||
moneyStockSuggestDTOS = bseGainer();
|
||||
}
|
||||
|
||||
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
|
||||
Map<Object, Boolean> map = new HashMap<>();
|
||||
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
|
||||
.filter(f->StringUtils.isNotBlank(f.getStockName()))
|
||||
.filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
|
||||
List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(selfUlrList)){
|
||||
@@ -565,7 +569,10 @@ public class MoneyApiController {
|
||||
}else if(StringUtils.equals(stockType,"bse")){
|
||||
moneyStockSuggestDTOS = bseTopLoser();
|
||||
}
|
||||
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
|
||||
Map<Object, Boolean> map = new HashMap<>();
|
||||
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
|
||||
.filter(f->StringUtils.isNotBlank(f.getStockName()))
|
||||
.filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
|
||||
moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
|
||||
List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
|
||||
@@ -615,7 +622,10 @@ public class MoneyApiController {
|
||||
}else if(StringUtils.equals(stockType,"bse")){
|
||||
moneyStockSuggestDTOS = bseActives();
|
||||
}
|
||||
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream().filter(f->StringUtils.isNotBlank(f.getStockName())).collect(Collectors.toList());
|
||||
Map<Object, Boolean> map = new HashMap<>();
|
||||
moneyStockSuggestDTOS = moneyStockSuggestDTOS.stream()
|
||||
.filter(f->StringUtils.isNotBlank(f.getStockName()))
|
||||
.filter(i -> map.putIfAbsent(i.getStockName(), Boolean.TRUE) == null).collect(Collectors.toList());
|
||||
if(CollectionUtils.isNotEmpty(moneyStockSuggestDTOS)){
|
||||
moneyStockSuggestDTOS.stream().forEach(f->f.setDispId(extractLastSegment(f.getStockUrl())));
|
||||
List<String> selfUlrList = moneyStockSuggestDTOS.stream().map(MoneyStockSuggestDTO::getStockName).collect(Collectors.toList());
|
||||
@@ -667,14 +677,14 @@ public class MoneyApiController {
|
||||
int countback = 5;
|
||||
if(StringUtils.equals("H",resolution)){
|
||||
to = (long) (System.currentTimeMillis() / 1000);
|
||||
from = to - (1* 24 * 60 * 60 );
|
||||
countback = 16;
|
||||
request.setResolution("60");
|
||||
from = to - ( 60 * 60 );
|
||||
countback = 60;
|
||||
request.setResolution("1");
|
||||
}else if(StringUtils.equals("D",resolution)){
|
||||
to = (long) (System.currentTimeMillis() / 1000);
|
||||
from = to - (24 * 60 * 60 );
|
||||
countback = 30;
|
||||
request.setResolution("60");
|
||||
countback = 75;
|
||||
request.setResolution("5");
|
||||
}else if(StringUtils.equals("W",resolution)){
|
||||
to = (long) (System.currentTimeMillis() / 1000);
|
||||
from = to - (10 * 24 * 60 * 60 );
|
||||
@@ -716,6 +726,7 @@ public class MoneyApiController {
|
||||
}
|
||||
|
||||
if (response != null) {
|
||||
setResponse(response,resolution);
|
||||
// API request successful, return the response
|
||||
return ResponseEntity.ok(response);
|
||||
} else {
|
||||
@@ -726,6 +737,50 @@ public class MoneyApiController {
|
||||
// 返回响应
|
||||
}
|
||||
|
||||
private void setResponse(StockHistoryResponse response,String resolution){
|
||||
if(!"ok".equals(response.getS())){
|
||||
return;
|
||||
}
|
||||
if(Objects.isNull(response.getT())){
|
||||
return;
|
||||
}
|
||||
if(StringUtils.equals("H",resolution) || StringUtils.equals("D",resolution)) {
|
||||
List<Long> t = new ArrayList<>();
|
||||
List<Double> o = new ArrayList<>();
|
||||
List<Double> h = new ArrayList<>();
|
||||
List<Double> l = new ArrayList<>();
|
||||
List<Double> c = new ArrayList<>();
|
||||
List<Long> v = new ArrayList<>();
|
||||
|
||||
//根据时间过滤，只留当天的数据
|
||||
Date currentTime = new Date();
|
||||
//判断最后一条是不是当天的数据，如果不是，把最后一条的时间作为当天的时间
|
||||
long getTime = response.getT().get(response.getT().size() - 1) * 1000L;
|
||||
if(!DateUtil.isSameDay(currentTime, new Date(getTime))){
|
||||
currentTime = new Date(getTime);
|
||||
}
|
||||
int i = 0;
|
||||
for (Long time : response.getT()) {
|
||||
time = time * 1000;
|
||||
if (DateUtil.isSameDay(currentTime, new Date(time))) {
|
||||
t.add(response.getT().get(i));
|
||||
o.add(response.getO().get(i));
|
||||
h.add(response.getH().get(i));
|
||||
l.add(response.getL().get(i));
|
||||
c.add(response.getC().get(i));
|
||||
v.add(response.getV().get(i));
|
||||
}
|
||||
i++;
|
||||
}
|
||||
response.setT(t);
|
||||
response.setO(o);
|
||||
response.setH(h);
|
||||
response.setL(l);
|
||||
response.setC(c);
|
||||
response.setV(v);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -750,13 +805,16 @@ public class MoneyApiController {
|
||||
|
||||
|
||||
public static void main(String[] args) {
|
||||
nseGainer();
|
||||
nseActives();
|
||||
nseTopLoser();
|
||||
|
||||
bseActives();
|
||||
bseGainer();
|
||||
bseTopLoser();
|
||||
// nseGainer();
|
||||
//// nseActives();
|
||||
//// nseTopLoser();
|
||||
////
|
||||
//// bseActives();
|
||||
//// bseGainer();
|
||||
//// bseTopLoser();
|
||||
System.out.println(new Date());
|
||||
System.out.println(new Date(1713949200000L));
|
||||
System.out.println(DateUtil.isSameDay(new Date(),new Date(1713949200000L)));
|
||||
}
|
||||
|
||||
private Cache<String, List<MoneyStockSuggestDTO>> gainerStockSuggestCache = CacheBuilder.newBuilder()
|
||||
|
||||
@@ -238,10 +238,19 @@ public class StockApiController {
|
||||
@ResponseBody
|
||||
public ServerResponse getIndiaIndexByToday() {
|
||||
String INDEX_CODE = "TODAY_INDEX";
|
||||
return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE, (string) -> {
|
||||
return RequestCacheUtils.cache("getIndiaIndexByToday.do", INDEX_CODE,60000, (string) -> {
|
||||
return this.stockService.getIndexByBtoday();
|
||||
});
|
||||
}
|
||||
@RequestMapping({"getIndiaIndexByEttech.do"})
|
||||
@ApiOperation(value = "印度--获取指定指数信息-Ettech", httpMethod = "GET")
|
||||
@ResponseBody
|
||||
public ServerResponse getIndiaIndexByEttech() {
|
||||
String INDEX_CODE = "TODAY_INDEX";
|
||||
return RequestCacheUtils.cache("getIndiaIndexByEttech.do", INDEX_CODE, (string) -> {
|
||||
return this.stockService.getEttechcharts();
|
||||
});
|
||||
}
|
||||
|
||||
//根据股票id查询 股票指数、大盘指数信息
|
||||
@RequestMapping({"getMarketByStockGid.do"})
|
||||
|
||||
@@ -17,7 +17,7 @@ spring:
|
||||
datasource:
|
||||
stock-market:
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:mysql://46.250.238.241:33306/india_stock?useUnicode=true&characterEncoding=utf-8
|
||||
url: jdbc:mysql://149.88.86.7:33306/india_stock?useUnicode=true&characterEncoding=utf-8
|
||||
username: root
|
||||
password: 33BsUUcnXRYgwtIND
|
||||
maxActive: 500
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user