From 919664ba842f1b739fc4242636bb8b839b445757 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Wed, 7 Jan 2026 15:21:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(common):=20=E5=B0=86=20Page=20?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=9A=84=20items=20=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BB=8E=20Stream=20=E6=94=B9=E4=B8=BA=20List?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lanyuanxiaoyao/service/template/common/entity/Page.java | 4 ++-- .../template/jpa/controller/SimpleControllerSupport.java | 1 + .../service/template/jpa/service/SimpleServiceSupport.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java b/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java index 3026cb9..0018540 100644 --- a/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java +++ b/spring-boot-service-template-common/src/main/java/com/lanyuanxiaoyao/service/template/common/entity/Page.java @@ -1,6 +1,6 @@ package com.lanyuanxiaoyao.service.template.common.entity; -import java.util.stream.Stream; +import java.util.List; /** * 分页数据封装类 @@ -27,5 +27,5 @@ import java.util.stream.Stream; * @param items 数据流,包含当前页的所有记录 * @param total 总记录数,用于计算总页数和显示分页信息 */ -public record Page(Stream items, long total) { +public record Page(List items, long total) { } diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java index a790481..a000561 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/controller/SimpleControllerSupport.java @@ -127,6 +127,7 @@ public abstract class SimpleControllerSupport { try { return mapper.apply(entity); diff --git a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java index bec8969..dfd026e 100644 --- a/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java +++ b/spring-boot-service-template-jpa/src/main/java/com/lanyuanxiaoyao/service/template/jpa/service/SimpleServiceSupport.java @@ -201,7 +201,7 @@ public abstract class SimpleServiceSupport implemen }, pageRequest ); - return new Page<>(result.get(), result.getTotalElements()); + return new Page<>(result.get().toList(), result.getTotalElements()); } /**