From 513e5442723f501525bf9ca6210b16561e5d3a2b Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 24 Mar 2026 11:41:07 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
index cf85675..cc75590 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
@@ -1,14 +1,20 @@
package com.yami.trading.api.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yami.trading.bean.cms.News;
import com.yami.trading.common.constants.Constants;
+import com.yami.trading.common.constants.RedisKeys;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.DateUtils;
+import com.yami.trading.common.util.RedisUtil;
import com.yami.trading.common.util.StringUtils;
+import com.yami.trading.huobi.hobi.http.HttpHelper;
+import com.yami.trading.huobi.hobi.http.HttpMethodType;
import com.yami.trading.security.common.util.SecurityUtils;
import com.yami.trading.service.AwsS3OSSFileService;
import com.yami.trading.service.cms.NewsSerivce;
@@ -195,7 +201,6 @@
.or().eq(News::getUserId, "") // 条件3：userId=空字符串
);
Page<News> page = new Page<>(1, 1000000);
- System.out.println(lambdaQueryWrapper.getSqlSegment());
newsService.page(page, lambdaQueryWrapper);
list = page.getRecords();
} else {
@@ -207,7 +212,6 @@
.or() // 或者
.eq(News::getUserId, "") // 条件2：userId为空字符串
);
- System.out.println(lambdaQueryWrapper.getSqlSegment());
Page<News> page = new Page<>(1, 1000000);
newsService.page(page, lambdaQueryWrapper);
list = page.getRecords();
@@ -225,4 +229,22 @@
return Result.succeed(list);
}
+ /**
+ * 获取 新闻 列表
+ */
+ @RequestMapping(action + "getUsHeadNews.action")
+ public Object getUsHeadNews(HttpServletRequest request) {
+ JSONObject jsonObject = RedisUtil.get(RedisKeys.NEWS_TOP_HEADLINES);
+ if (jsonObject == null || jsonObject.isEmpty()) {
+ String result = HttpHelper.getJSONFromHttp("https://newsapi.org/v2/top-headlines?country=us&category=business&apiKey=f39cfa8922534af295491f38f664ea3d", null, HttpMethodType.GET);
+ JSONObject resultJson = JSON.parseObject(result);
+ String status = resultJson.getString("status");
+ if ("ok".equals(status)) {
+ RedisUtil.set(RedisKeys.NEWS_TOP_HEADLINES, resultJson);
+ jsonObject = resultJson;
+ }
+ }
+ return jsonObject;
+ }
+
}
--
Gitblit v1.9.3