From ef5228063b27199faae717265b4f722c6e784bce Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 08 May 2024 18:14:34 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java |   46 ++++++++++++++++++----------------------------
 1 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
index 8ee8059..4c49c04 100644
--- a/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/SiteNewsServiceImpl.java
@@ -80,18 +80,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);
@@ -106,14 +102,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);
         }
@@ -139,9 +133,8 @@
     /*新闻资讯-抓取*/
     @Override
     public int grabNews() {
-        int ret = 0;
-         addNews(1, EStockType.US.getStockUrl() +"stock-markets?key="+ EStockType.US.getStockKey() +"&type=4");
-         addNews(2,EStockType.MAS.getStockUrl() +"stock-markets?key="+ EStockType.MAS.getStockKey() +"&type=5");
+            int ret = 0;
+         addNews(1, EStockType.IN.getStockUrl() +"stock-markets?key="+ EStockType.IN.getStockKey() +"&type=4");
          return ret;
     }
 
@@ -160,11 +153,8 @@
                         siteNews.setSourceName("");
                         siteNews.setTitle(jsonObject.getString("title"));
                         Long showTime = jsonObject.getLong("time");
-                        siteNews.setShowTime(new Date(showTime));
-                        if(jsonObject.has("img")){
-                            convertBase64ToImage(jsonObject.getString("img"),PropertiesUtil.getProperty("ftp.address")+newsId+".jpg");
-                            siteNews.setImgurl(PropertiesUtil.getProperty("ftp.server.http.prefix")+newsId+".jpg");
-                        }
+                        siteNews.setShowTime(new Date(showTime * 1000));
+                        siteNews.setImgurl(jsonObject.getString("img"));
                         siteNews.setDescription(jsonObject.getString("content"));
                         siteNews.setContent(jsonObject.getString("content"));
                         siteNews.setStatus(1);

--
Gitblit v1.9.3