From fff9ac550c469aafa60ce8f1adff5edd6941f8e1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 15:29:01 +0800
Subject: [PATCH] 获取盘前交易列表

---
 src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java |   85 +++++++++++++++++++++---------------------
 1 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index cad7d0e..e35de8d 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -3,11 +3,11 @@
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.nq.common.ServerResponse;
-import com.nq.constant.StockConstant;
 import com.nq.dao.SiteNewsMapper;
 import com.nq.pojo.SiteNews;
 import com.nq.service.ISiteNewsService;
 import com.nq.utils.*;
+import com.nq.utils.http.HttpRequest;
 import com.nq.utils.translate.GoogleTranslateUtil;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -23,6 +23,8 @@
 import java.util.Base64;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 新闻资讯
@@ -79,18 +81,14 @@
         List<SiteNews> listData = this.siteNewsMapper.pageList(pageNum, pageSize, type, sort, keyword);
         GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
         //取出每一条数据的内容,进行翻译
-
-//        if (request.getHeader("lang") != null && !request.getHeader("lang").equals("zh-CN")&& !request.getHeader("lang").equals("tww")&& !request.getHeader("lang").equals("")) {
-//            for (SiteNews siteNews : listData) {
-//                try {
-//                    siteNews.setTitle(googleTranslateUtil.translate(siteNews.getTitle(), request.getHeader("lang")));
-//                    siteNews.setSourceName(googleTranslateUtil.translate(siteNews.getSourceName(), request.getHeader("lang")));
-//                } catch (Exception e) {
-//                   log.error("翻译失败");
-//                }
-//            }
-//    }
-
+        for (SiteNews siteNews : listData) {
+            try {
+                siteNews.setTitle(googleTranslateUtil.translate(siteNews.getTitle(), request.getHeader("lang")));
+                siteNews.setSourceName(googleTranslateUtil.translate(siteNews.getSourceName(), request.getHeader("lang")));
+            } catch (Exception e) {
+                log.error("翻译失败");
+            }
+        }
 
         PageInfo pageInfo = new PageInfo(listData);
         pageInfo.setList(listData);
@@ -105,14 +103,12 @@
             GoogleTranslateUtil googleTranslateUtil = new GoogleTranslateUtil();
             //取出每一条数据的内容,进行翻译
 
-            if (request.getHeader("lang") != null && !request.getHeader("lang").equals("zh-CN")&& !request.getHeader("lang").equals("tww")&& !request.getHeader("lang").equals("")) {
-                try {
-                    model.setContent(googleTranslateUtil.translate(model.getContent(), request.getHeader("lang")));
-                    model.setTitle(googleTranslateUtil.translate(model.getTitle(), request.getHeader("lang")));
-                    model.setDescription(googleTranslateUtil.translate(model.getDescription(), request.getHeader("lang")));
-                } catch (Exception e) {
-                    log.error("翻译失败");
-                }
+            try {
+                model.setContent(googleTranslateUtil.translate(model.getContent(), request.getHeader("lang")));
+                model.setTitle(googleTranslateUtil.translate(model.getTitle(), request.getHeader("lang")));
+                model.setDescription(googleTranslateUtil.translate(model.getDescription(), request.getHeader("lang")));
+            } catch (Exception e) {
+                log.error("翻译失败");
             }
             return ServerResponse.createBySuccess(model);
         }
@@ -135,40 +131,44 @@
         return ServerResponse.createBySuccess(pageInfo);
     }
 
-    /*新闻资讯-抓取*/
     @Override
-    public int grabNews() {
-        int ret = 0;
-        //新闻类型:1、财经要闻,2、经济数据,3、全球股市,4、7*24全球,5、商品资讯,6、上市公司,7、全球央行
-         addNews(1, StockConstant.HTTP_API +"stock-markets?key="+ StockConstant.KEY +"&type=4");
-         addNews(2, StockConstant.HTTP_API+"stock-markets?key="+ StockConstant.KEY +"&type=5");
-         addNews(4, StockConstant.HTTP_API+"stock-markets?key="+ StockConstant.KEY +"&type=6");
-        return ret;
+    public void grabNews() {
+        // 创建固定大小的线程池,根据需求调整线程数量
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        try {
+            // 提交新闻抓取任务
+            executor.submit(() ->
+                    addNews(1, PropertiesUtil.getProperty("US_HTTP_API") + "stock-markets?key=" + PropertiesUtil.getProperty("US_KEY") + "&type=1")
+            );
+            executor.submit(() ->
+                    addNews(1, PropertiesUtil.getProperty("JP_HTTP_API") + "stock-markets?key=" + PropertiesUtil.getProperty("JP_KEY") + "&type=1")
+            );
+        } finally {
+            // 关闭线程池
+            executor.shutdown();
+        }
+
     }
 
-    /*
-    *抓取新闻专用
-    * type:新闻类型:1、财经要闻,2、经济数据,3、全球股市,4、7*24全球,5、商品资讯,6、上市公司,7、全球央行
-    * */
-    private int addNews(Integer type, String url){
-        int k = 0;
+    private void addNews(Integer type, String url) {
         try {
             String newlist = HttpRequest.doGrabGet(url);
             JSONArray jsonArray = JSONArray.fromObject(newlist);
-            if(jsonArray.size()>0){
+            if (jsonArray.size() > 0) {
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = jsonArray.getJSONObject(i);
                     String newsId = jsonObject.getString("id");
-                    if(siteNewsMapper.getNewsBySourceIdCount(newsId) == 0){
+                    if (siteNewsMapper.getNewsBySourceIdCount(newsId) == 0) {
                         SiteNews siteNews = new SiteNews();
                         siteNews.setSourceId(newsId);
                         siteNews.setSourceName("");
                         siteNews.setTitle(jsonObject.getString("title"));
-                        Long showTime = jsonObject.getLong("time");
-                        siteNews.setShowTime(new Date(showTime));
+                        //Long showTime = jsonObject.getLong("time");
+                        long showTime = jsonObject.optLong("time", System.currentTimeMillis() / 1000); // 默认值,表示未找到或转换失败
+                        siteNews.setShowTime(new Date(showTime * 1000));
                         if(jsonObject.has("img")){
-                            String imgBase = convertBase64ToImage(jsonObject.getString("img"),"/www/wwwroot/dabao/"+newsId+".jpg");
-                            siteNews.setImgurl("https://img.jumptalk.net/"+newsId+".jpg");
+                            convertBase64ToImage(jsonObject.getString("img"),PropertiesUtil.getProperty("ftp.address")+newsId+".jpg");
+                            siteNews.setImgurl(PropertiesUtil.getProperty("ftp.server.http.prefix")+newsId+".jpg");
                         }
                         siteNews.setDescription(jsonObject.getString("content"));
                         siteNews.setContent(jsonObject.getString("content"));
@@ -180,10 +180,11 @@
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.error("添加新闻出现异常: " + e.getMessage());
         }
-        return k;
     }
 
+
     public static String  convertBase64ToImage(String base64Str, String path) {
         byte[] imageBytes = Base64.getDecoder().decode(base64Str);
         try {

--
Gitblit v1.9.3