diff --git a/src/main/java/cn/stock/market/infrastructure/job/StockTask.java b/src/main/java/cn/stock/market/infrastructure/job/StockTask.java index 89430db..cbf31fc 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/StockTask.java +++ b/src/main/java/cn/stock/market/infrastructure/job/StockTask.java @@ -353,12 +353,13 @@ public class StockTask { public void saveStockNews() { String news = stockService.getNews(); List newsList = Arrays.asList(news.split("") + 6,n.indexOf("
") - 47); + String id = contentUrl.substring(contentUrl.lastIndexOf("-") + 1, contentUrl.lastIndexOf("_")); + String imgUrl = n.substring(n.indexOf("img src=") + 9, n.indexOf("?")); + String time = n.substring(n.indexOf("Last Updated") + 23, n.indexOf("IST") - 9); + String title = n.substring(n.indexOf("html\">") + 6, n.indexOf("
") - 47); SiteNews siteNews = new SiteNews(); siteNews.setAddTime(new Date()); diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index 2a65946..0702172 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; +import cn.qutaojing.common.PageParam; import cn.stock.market.domain.basic.entity.SiteNews; import cn.stock.market.domain.basic.repository.SiteNewsRepository; import cn.stock.market.infrastructure.db.po.QSiteNewsPO; @@ -149,39 +150,10 @@ public class StockApiController { } @RequestMapping({"getINDNews.do"}) - @ApiOperation(value = "印度热门股票列表", httpMethod = "GET") + @ApiOperation(value = "印度新闻列表", httpMethod = "GET") @ResponseBody - public ServerResponse getINDNews() { - String news = stockService.getNews(); - List newsList = Arrays.asList(news.split("") + 6, n.indexOf("
") - 47); - - SiteNews siteNews = new SiteNews(); - siteNews.setAddTime(new Date()); - siteNews.setSourceId(id); - siteNews.setTitle(title); - siteNews.setDescription(time); - siteNews.setImgurl(imgUrl); - siteNews.setContent(stockService.getNewsInfo(contentUrl)); - List list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id)); - if (list.size() == 0) { - newsRepository.save(siteNews); - } - }); - return null; - } - - @RequestMapping({"getINDNewsInfo.do"}) - @ApiOperation(value = "印度热门股票列表", httpMethod = "GET") - @ResponseBody - public ServerResponse getINDNewsInfo(@RequestParam("url") String url) { - return ServerResponse.createBySuccess(stockService.getNewsInfo(url)); + public ServerResponse getINDNews(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) { + return ServerResponse.createBySuccess(newsRepository.findAll(PageParam.of(pageNum, pageSize))); } //印度股票时线-K线