From 09206aedcfdf30050123e99f2af0a192ebad1de4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 03 Jun 2024 18:08:33 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index b24f843..3640e4d 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -81,17 +81,14 @@
         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);
@@ -140,17 +137,11 @@
     @Override
     public int grabNews() {
         int ret = 0;
-         addNews(1, EStockType.HG.getStockUrl() +"stock-markets?key="+ EStockType.HG.getStockKey() +"&type=1");
-//         addNews(2, EStockType.US.getStockUrl() +"stock-markets?key="+ EStockType.US.getStockKey() +"&type=4");
-//         addNews(3, EStockType.TH.getStockUrl() +"stock-markets?key="+ EStockType.TH.getStockKey() +"&type=4");
-//         addNews(4, EStockType.MAS.getStockUrl() +"stock-markets?key="+ EStockType.MAS.getStockKey() +"&type=4");
-        return ret;
+         addNews(1, EStockType.US.getStockUrl() +"stock-markets?key="+ EStockType.US.getStockKey() +"&type=4");
+         addNews(2,EStockType.IN.getStockUrl() +"stock-markets?key="+ EStockType.IN.getStockKey() +"&type=5");
+         return ret;
     }
 
-    /*
-    *抓取新闻专用
-    * type:新闻类型:1、财经要闻,2、经济数据,3、全球股市,4、7*24全球,5、商品资讯,6、上市公司,7、全球央行
-    * */
     private int addNews(Integer type, String url){
         int k = 0;
         try {
@@ -168,7 +159,7 @@
                         Long showTime = jsonObject.getLong("time");
                         siteNews.setShowTime(new Date(showTime));
                         if(jsonObject.has("img")){
-                            String imgBase = convertBase64ToImage(jsonObject.getString("img"),"/www/wwwroot/dabao/"+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"));

--
Gitblit v1.9.3