From a8e2dbcd82859a3f972192c60b95cba4defe1738 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 02 Apr 2026 14:10:01 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
index 97fae9b..51c6a8f 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.text.split.SplitIter;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.yami.trading.bean.data.domain.Realtime;
@@ -257,10 +258,10 @@
items.addAll(itemsTop);
} else if ("US-stocks".equals(type)) {
// 只查询指数top6
- items = itemService.cacheGetAll().stream().filter(item -> "global".equals(item.getCategory())).limit(3).collect(Collectors.toList());
- List<Item> itemsTop = itemService.cacheGetAll().stream().filter(item -> "technology,prominent".equals(item.getCategory())).sorted(Comparator.comparing(Item::getSorted).reversed()).limit(size)
- .collect(Collectors.toList());
- items.addAll(itemsTop);
+ items = itemService.cacheGetAll().stream().filter(item -> "US-stocks".equals(item.getType())).limit(6).collect(Collectors.toList());
+// List<Item> itemsTop = itemService.cacheGetAll().stream().filter(item -> "technology,prominent".equals(item.getCategory())).sorted(Comparator.comparing(Item::getSorted).reversed()).limit(size)
+// .collect(Collectors.toList());
+// items.addAll(itemsTop);
}
// 加密货币、外汇、 top4
else {
@@ -282,11 +283,17 @@
@RequestParam(required = false) Integer pageNo,
@RequestParam(required = false) Integer pageSize) {
try {
- pageSize = null == pageSize ? 1000 : pageSize;
+ pageSize = null == pageSize ? 100 : pageSize;
List<Item> itemsTotal;
List<Item> items = new ArrayList<>();
//按字符串排序
- List<Item> itemList = itemService.cacheGetAll().stream().sorted(Comparator.comparing(Item::getSorted).reversed()).collect(Collectors.toList());
+ List<Item> itemList = itemService.cacheGetAll().stream()
+ .sorted(Comparator.comparing(
+ item -> Integer.parseInt(item.getSorted()),
+ Comparator.reverseOrder()
+ ))
+ .collect(Collectors.toList());
+
//按数字排序
// List<Item> itemList = itemService.cacheGetAll().stream().sorted(Comparator.comparing(Item::getSorted, (x,y)->{
// int xInt = 0;
@@ -303,8 +310,7 @@
if (null != type && null != category) {
// 知名类 需要模糊查询
if ("prominent".equals(category)) {
- itemsTotal = new ArrayList<>(itemList).stream().filter(item -> item.getType().equals(type)
- && item.getCategory().contains(category)).collect(Collectors.toList());
+ itemsTotal = itemService.list(new LambdaQueryWrapper<Item>().eq(Item::getType,type));
} else {
itemsTotal = new ArrayList<>(itemList).stream().filter(item -> item.getType().equals(type)
&& item.getCategory().equals(category)).collect(Collectors.toList());
--
Gitblit v1.9.3