diff --git a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java index e74913e..e8103d2 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java +++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java @@ -1,8 +1,12 @@ package cn.stock.market.infrastructure.job; +import cn.stock.market.domain.basic.entity.SiteNews; import cn.stock.market.domain.basic.entity.Stock; +import cn.stock.market.domain.basic.repository.SiteNewsRepository; import cn.stock.market.domain.basic.repository.StockRepository; +import cn.stock.market.domain.basic.service.StockService; import cn.stock.market.infrastructure.api.investing.InvestingInvokerApis; +import cn.stock.market.infrastructure.db.po.QSiteNewsPO; import cn.stock.market.utils.Utils; import com.ag.utils.CollectionUtils; import com.alibaba.fastjson.JSON; @@ -11,10 +15,12 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.io.IOException; +import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; @@ -24,6 +30,11 @@ import java.util.concurrent.TimeUnit; @Component public class InvestingTask { + @Autowired + StockService stockService; + @Autowired + SiteNewsRepository newsRepository; + // @Scheduled(cron = "0 0 6 * * ?") public void syncIndiaData(){ log.info("同步股票数据开始。。。。"); @@ -94,4 +105,32 @@ public class InvestingTask { } } + + /*新闻接口*/ + @Scheduled(cron = "0 0 1 * * ?") + public void saveStockNews() { + 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); + } + }); + + } } 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 cbf31fc..eec6087 100644 --- a/src/main/java/cn/stock/market/infrastructure/job/StockTask.java +++ b/src/main/java/cn/stock/market/infrastructure/job/StockTask.java @@ -349,30 +349,30 @@ public class StockTask { // } /*新闻接口*/ - @Scheduled(cron = "0 0 1 * * ?") - public void saveStockNews() { - 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); - } - }); - - } + //@Scheduled(cron = "0 0 1 * * ?") + //@Scheduled(cron = "*/5 * * * * ?") + //public void saveStockNews() { + // 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); + // } + // }); + //} } diff --git a/src/main/java/cn/stock/market/web/StockApiController.java b/src/main/java/cn/stock/market/web/StockApiController.java index 36e9d2b..1a6d0e1 100644 --- a/src/main/java/cn/stock/market/web/StockApiController.java +++ b/src/main/java/cn/stock/market/web/StockApiController.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import cn.qutaojing.common.PageParam; +import cn.qutaojing.common.jpa.ConditionBuilder; import cn.stock.market.domain.basic.entity.SiteNews; import cn.stock.market.domain.basic.repository.SiteNewsRepository; import cn.stock.market.infrastructure.db.po.QSiteNewsPO; @@ -163,7 +164,7 @@ public class StockApiController { @ApiOperation(value = "印度新闻列表", httpMethod = "GET") @ResponseBody public ServerResponse getINDNews(@RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) { - return ServerResponse.createBySuccess(newsRepository.findAll(PageParam.of(pageNum, pageSize))); + return ServerResponse.createBySuccess(newsRepository.findAll(ConditionBuilder.builder().build(), PageParam.of(pageNum, pageSize), QSiteNewsPO.siteNewsPO.id.desc())); } //印度股票时线-K线