nhanvubk/ger-market-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/main/java/cn/stock/market/domain/basic/service/StockService.java
This commit is contained in:
gs
2024-06-20 14:47:53 +08:00
parent 146e9d9bc0 59a0480be0
commit 7b0a08150d
22 changed files with 1014 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/stock/market/web/ArticleApiController.java
View File

@@ -20,7 +20,7 @@ import cn.stock.market.domain.basic.service.SiteArticleService;
import cn.stock.market.utils.ServerResponse;
@Controller
@RequestMapping({"/api/market/art/", "/api/hq/art/"})
@RequestMapping({"/market/api/market/art/","/market/api/market/art/","/api/market/art/", "/api/hq/art/"})
@Api(tags = "公告信息")
public class ArticleApiController extends BaseController {

4
src/main/java/cn/stock/market/web/BTodayStockController.java
View File

@@ -35,7 +35,7 @@ public class BTodayStockController {
@Autowired
private BtodayStockService btodayStockService;
@GetMapping("/api/bToday/kLine")
@GetMapping({"/market/api/bToday/kLine","/api/bToday/kLine"})
@ApiOperation(value = "股票详情K线图",httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name="exchange",value = "BSE或者NSE"),
@@ -140,7 +140,7 @@ public class BTodayStockController {
"fromredis: 标志是否来自 Redis 缓存，false 表示不是", response = JSONObject.class),
})
@GetMapping("/api/bToday/stockDetail")
@GetMapping({"/market/api/bToday/stockDetail","/api/bToday/stockDetail"})
@EncryptFilter(decryptRequest = false)
public com.alibaba.fastjson.JSONObject getPriceChartCompanyPullView(
@RequestParam(value = "exchange") String exchange,

3
src/main/java/cn/stock/market/web/InfoController.java
View File

@@ -25,7 +25,7 @@ import springfox.documentation.annotations.ApiIgnore;
* @created Dec 4, 2018 10:22:44 PM
*/
@RestController
@RequestMapping("/api/hq/")
@RequestMapping({"/market/api/hq/","/api/hq/"})
@ApiIgnore
public class InfoController {
@Value("${spring.application.name}")
@@ -40,6 +40,7 @@ public class InfoController {
public Map<String, Object> test(@RequestParam(required = false) String key) {
Map<String, Object> map = Maps.newHashMap();
map.put("stockMarketDbUrl", stockMarketDbUrl);
map.put("stockMarketDbUrl1", stockMarketDbUrl);
if(StringUtils.isNotBlank(key)) {
map.put("key", PropertiesUtil.getProperty(key));
}

124
src/main/java/cn/stock/market/web/MoneyApiController.java
View File

@@ -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;
/**
@@ -166,13 +168,17 @@ public class MoneyApiController {
"priceprevclose: 前一交易日的收盘价\n" +
"30DayAvg: 过去30天的平均", response = JSONObject.class),
})
@GetMapping("/api/market/money/getStockDetail")
@GetMapping({"/market/api/market/money/getStockDetail","/api/market/money/getStockDetail"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
public ServerResponse getStockDetail(@RequestParam String stockType, @RequestParam String symbol ) {
String url = String.format("https://priceapi.moneycontrol.com/pricefeed/%s/equitycash/%s",stockType,symbol);
MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType).and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))).orElse(null);
MoneyStock moneyStock = moneyStockRepository.findOne(QMoneyStockPO.moneyStockPO.stockType.eq(stockType)
.and(QMoneyStockPO.moneyStockPO.moneyScId.eq(symbol))
.and(QMoneyStockPO.moneyStockPO.isLock.eq(0))
.and(QMoneyStockPO.moneyStockPO.isShow.eq(0)))
.orElse(null);
/* if(moneyStock==null){
return ServerResponse.createByErrorMsg("没有找到该股票");
}*/
@@ -203,6 +209,10 @@ public class MoneyApiController {
if(null!=moneyStock){
json1.put("id",moneyStock.getId());
}
if(StringUtils.equals(data.getString("pricecurrent"),"0.00")
&& (!StringUtils.equals(data.getString("priceprevclose"),"0.00"))){
json1.put("pricecurrent",data.getString("priceprevclose"));
}
}
return ServerResponse.createBySuccess(json1);
}
@@ -501,7 +511,7 @@ public class MoneyApiController {
@ApiResponse(code = 200, message = "" +
"股票推荐相关: top gainer", response = JSONObject.class),
})
@GetMapping("/api/market/money/getTopGainer")
@GetMapping({"/market/api/market/money/getTopGainer","/api/market/money/getTopGainer"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@@ -517,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)){
@@ -544,7 +556,7 @@ public class MoneyApiController {
@ApiResponse(code = 200, message = "" +
"股票推荐相关: TopLoser", response = JSONObject.class),
})
@GetMapping("/api/market/money/getTopLoser")
@GetMapping({"/market/api/market/money/getTopLoser","/api/market/money/getTopLoser"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@@ -557,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());
@@ -594,7 +609,7 @@ public class MoneyApiController {
@ApiResponse(code = 200, message = "" +
"股票推荐相关: top active", response = JSONObject.class),
})
@GetMapping("/api/market/money/getTopActives")
@GetMapping({"/market/api/market/money/getTopActives","/api/market/money/getTopActives"})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@@ -607,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());
@@ -636,7 +654,7 @@ public class MoneyApiController {
@GetMapping("/api/market/money/history/kLine")
@GetMapping({"/market/api/market/money/history/kLine","/api/market/money/history/kLine"})
@ApiOperation(value = "获取kline的money数据源", notes = "获取kline的money数据源",response = StockHistoryResponse.class)
@ApiImplicitParams({
@ApiImplicitParam(name = "symbol", value = "Stock symbol 对应的是NSEID 或者是BSEID", required = true, dataType = "String", paramType = "query"),
@@ -647,7 +665,7 @@ public class MoneyApiController {
@ApiImplicitParam(name = "currencyCode", value = "INR 不变", required = true, dataType = "String", paramType = "query")
})
@ResponseBody
@EncryptFilter(decryptRequest = false)
@EncryptFilter(decryptRequest = false)
public ResponseEntity<StockHistoryResponse> getStockHistory( @RequestParam String symbol,
@RequestParam String resolution
) {
@@ -659,24 +677,24 @@ public class MoneyApiController {
int countback = 5;
if(StringUtils.equals("H",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (1 * 60 * 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 = 9;
request.setResolution("60");
countback = 390;
request.setResolution("1");
}else if(StringUtils.equals("W",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (10 * 24 * 60 * 60 );
countback = 7;
request.setResolution("1D");
from = to - (7 * 24 * 60 * 60 );
countback = 471;
request.setResolution("5");
}else if(StringUtils.equals("M",resolution)){
to = (long) (System.currentTimeMillis() / 1000);
from = to - (35 * 24 * 60 * 60 );
countback = 30;
request.setResolution("1D");
countback = 328;
request.setResolution("30");
}
request.setFrom(from);
@@ -708,6 +726,7 @@ public class MoneyApiController {
}
if (response != null) {
setResponse(response,resolution);
// API request successful, return the response
return ResponseEntity.ok(response);
} else {
@@ -718,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);
}
}
@@ -742,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()

3
src/main/java/cn/stock/market/web/MoneyProxyApiControl.java
View File

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -23,7 +24,7 @@ import java.net.URL;
public class MoneyProxyApiControl {
@RequestMapping(value = "/api/proxy/queryStockMoneyProxy",method = RequestMethod.GET)
@GetMapping({"/market/api/proxy/queryStockMoneyProxy","/api/proxy/queryStockMoneyProxy"})
public JSONObject queryStockByMoneyIdAndExchangeType(String scId,String exchangeType){
return stockByMoneyIdAndExchangeTypeFromHttp(scId,exchangeType);
}

2
src/main/java/cn/stock/market/web/SiteNewsController.java
View File

@@ -18,7 +18,7 @@ import cn.stock.market.domain.basic.service.SiteNewsService;
import cn.stock.market.utils.ServerResponse;
@Controller
@RequestMapping({"/api/market/news/", "/api/hq/news/"})
@RequestMapping({"/market/api/market/news/", "/market/api/hq/news/","/api/market/news/", "/api/hq/news/"})
@Api(tags="新闻资讯")
public class SiteNewsController {
private static final Logger log = LoggerFactory.getLogger(SiteNewsController.class);

21
src/main/java/cn/stock/market/web/StockApiController.java
View File

@@ -56,7 +56,7 @@ import springfox.documentation.annotations.ApiIgnore;
@Controller
@Api(value = "/StockApiController", tags = "股票行情")
@RequestMapping({"/api/market/stock/", "/api/hq/stock/"})
@RequestMapping({"/market/api/market/stock/", "/market/api/hq/stock/","/api/market/stock/", "/api/hq/stock/"})
public class StockApiController {
private static final Logger log = LoggerFactory.getLogger(StockApiController.class);
@@ -233,6 +233,25 @@ public class StockApiController {
return this.stockService.getIndiaIndex();
}
@RequestMapping({"getIndiaIndexByToday.do"})
@ApiOperation(value = "印度--获取指定指数信息", httpMethod = "GET")
@ResponseBody
public ServerResponse getIndiaIndexByToday() {
String INDEX_CODE = "TODAY_INDEX";
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"})
@ApiOperation(value = "根据股票id查询 股票指数、大盘指数信息", httpMethod = "GET")

2
src/main/java/cn/stock/market/web/TodayApiController.java
View File

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
@Api(value = "/TodayApiController", tags = "today股票行情")
@RequestMapping({"/api/market/today/"})
@RequestMapping({"/market/api/market/today/","/api/market/today/"})
public class TodayApiController {
@RequestMapping({"getTopGainers.do"})