From cab41175eaad28fc5f2153bf860046db80d52d59 Mon Sep 17 00:00:00 2001
From: dengli <dengli@juyou88.com>
Date: Wed, 3 Jan 2024 18:32:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=88=AC=E5=8F=96=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../infrastructure/job/InvestingTask.java     | 40 ++++++++++++++
 .../market/infrastructure/job/StockTask.java  | 52 +++++++++----------
 2 files changed, 66 insertions(+), 26 deletions(-)

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..1609373 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,33 @@ public class InvestingTask {
         }
 
     }
+
+    /*新闻接口*/
+    //@Scheduled(cron = "0 0 1 * * ?")
+    @Scheduled(cron = "*/10 * * * * ?")
+    public void saveStockNews() {
+        String news = stockService.getNews();
+        List<String> newsList = Arrays.asList(news.split("<a href="));
+        newsList = newsList.subList(1, newsList.size());
+        newsList.forEach( n -> {
+            String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
+            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("<div class=\"short-video-img\">") - 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<SiteNews> 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<String> newsList = Arrays.asList(news.split("<a href="));
-		newsList = newsList.subList(1, newsList.size());
-		newsList.forEach( n -> {
-			String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
-			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("<div class=\"short-video-img\">") - 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<SiteNews> 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<String> newsList = Arrays.asList(news.split("<a href="));
+	//	newsList = newsList.subList(1, newsList.size());
+	//	newsList.forEach( n -> {
+	//		String contentUrl = n.substring(1, n.indexOf("class=\"img-smllnews\"") - 2);
+	//		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("<div class=\"short-video-img\">") - 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<SiteNews> list = newsRepository.findAll(QSiteNewsPO.siteNewsPO.sourceId.eq(id));
+	//		if (list.size() == 0) {
+	//			newsRepository.save(siteNews);
+	//		}
+	//	});
+	//}
 }

From 4726a5d5d2be063045f192ec5a55dffe49f0335b Mon Sep 17 00:00:00 2001
From: dengli <dengli@juyou88.com>
Date: Wed, 3 Jan 2024 18:35:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E4=B8=80=E7=82=B9?=
 =?UTF-8?q?=E7=88=AC=E5=8F=96=E6=96=B0=E9=97=BB=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/stock/market/infrastructure/job/InvestingTask.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 1609373..e8103d2 100644
--- a/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
+++ b/src/main/java/cn/stock/market/infrastructure/job/InvestingTask.java
@@ -107,8 +107,7 @@ public class InvestingTask {
     }
 
     /*新闻接口*/
-    //@Scheduled(cron = "0 0 1 * * ?")
-    @Scheduled(cron = "*/10 * * * * ?")
+    @Scheduled(cron = "0 0 1 * * ?")
     public void saveStockNews() {
         String news = stockService.getNews();
         List<String> newsList = Arrays.asList(news.split("<a href="));

From ee9f655db84bb5e123597b53ea00c22d8cd089c8 Mon Sep 17 00:00:00 2001
From: dengli <dengli@juyou88.com>
Date: Wed, 3 Jan 2024 18:44:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E9=97=BB?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/stock/market/web/StockApiController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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线