From 7295334ff00457c111484d2f021a9c33bbf4a5f2 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sun, 04 Jan 2026 16:50:46 +0800
Subject: [PATCH] 充值
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 321698f..d1f1804 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
@@ -4,6 +4,7 @@
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.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.DateUtils;
@@ -18,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@RestController
@@ -54,7 +56,7 @@
}
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
return Result.succeed(news);
@@ -65,7 +67,8 @@
*/
@RequestMapping(action + "list.action")
public Object list(HttpServletRequest request) {
-
+ List<News> list = new ArrayList<>();
+ //return list;
String page_no = request.getParameter("page_no");
String language = request.getParameter("language");
if (StringUtils.isNullOrEmpty(page_no)) {
@@ -80,11 +83,16 @@
int page_no_int = Integer.valueOf(page_no).intValue();
Page<News> page = new Page<>(1, 1000000);
// List<News> list = this.newsService.cachePagedQuery(page_no_int, 20, language).getElements();
- LambdaQueryWrapper<News> lambdaQueryWrapper = Wrappers.<News>query().lambda().eq(News::getLanguage, language)
- .eq(News::isPopUp,false);
+ // 1. 获取当前时间（对应SQL中的NOW()）
+ Date now = new Date();
+ LambdaQueryWrapper<News> lambdaQueryWrapper = Wrappers.<News>query().lambda()
+ .eq(News::getLanguage, language)
+ .eq(News::isPopUp,false)
+ .le(News::getStartTime, now)
+ .ge(News::getEndTime, now);
lambdaQueryWrapper.orderByDesc(News::getCreateTime);
newsService.page(page, lambdaQueryWrapper);
- List<News> list = page.getRecords();
+ list = page.getRecords();
if (list != null) {
for (int i = 0; i < list.size(); i++) {
list.get(i).setCreateTimeStr(DateUtils.format(list.get(i).getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
@@ -101,7 +109,7 @@
news.setShow(news.getUserId().equals(SecurityUtils.getCurrentUserId()));
}
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
}
@@ -148,7 +156,7 @@
list.get(i).setCreateTimeStr(DateUtils.format(list.get(i).getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
News news = list.get(i);
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
}
@@ -195,7 +203,7 @@
list.get(i).setCreateTimeStr(DateUtils.format(list.get(i).getCreateTime(), DateUtils.DF_yyyyMMddHHmmss));
News news = list.get(i);
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(awsS3OSSFileService.getUrl(news.getImgUrl()));
+ news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
}
--
Gitblit v1.9.3