新增PageResult作为Service.queryAll方法的默认返回值，修改代码模板，修改UserService.queryAll()作为示例

eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java

@@ -0,0 +1,22 @@
+package me.zhengjie.utils;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 分页查询结果
+ * @author wujiawei
+ * @see
+ * @since 2021/3/17 下午4:06
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PageResult<T> {
+    
+    private List<T> content;
+    private long totalElements;
+}

eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java

@@ -42,14 +42,25 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
 
     /**
      * Page 数据处理，预防redis反序列化报错
+     *
+     * 使用${@link PageUtil#toPageResult(Page)}代替
+     *
      */
+    @Deprecated
     public static Map<String,Object> toPage(Page page) {
         Map<String,Object> map = new LinkedHashMap<>(2);
         map.put("content",page.getContent());
         map.put("totalElements",page.getTotalElements());
         return map;
     }
-
+    
+    /**
+     * Page 数据处理，预防redis反序列化报错
+     */
+    public static <T> PageResult<T> toPageResult(Page<T> page) {
+        return new PageResult<T>(page.getContent(), page.getTotalElements());
+    }
+    
     /**
      * 自定义分页
      */

eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java

@@ -18,6 +18,7 @@ package me.zhengjie.modules.system.service;
 import me.zhengjie.modules.system.domain.User;
 import me.zhengjie.modules.system.service.dto.UserDto;
 import me.zhengjie.modules.system.service.dto.UserQueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
@@ -91,7 +92,7 @@ public interface UserService {
      * @param pageable 分页参数
      * @return /
      */
-    Object queryAll(UserQueryCriteria criteria, Pageable pageable);
+    PageResult<UserDto> queryAll(UserQueryCriteria criteria, Pageable pageable);
 
     /**
      * 查询全部不分页

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -61,9 +61,9 @@ public class UserServiceImpl implements UserService {
     private final OnlineUserService onlineUserService;
 
     @Override
-    public Object queryAll(UserQueryCriteria criteria, Pageable pageable) {
+    public PageResult<UserDto> queryAll(UserQueryCriteria criteria, Pageable pageable) {
         Page<User> page = userRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
-        return PageUtil.toPage(page.map(userMapper::toDto));
+        return PageUtil.toPageResult(page.map(userMapper::toDto));
     }
 
     @Override

eladmin-system/src/main/resources/template/generator/admin/Service.ftl

@@ -18,6 +18,7 @@ package ${package}.service;
 import ${package}.domain.${className};
 import ${package}.service.dto.${className}Dto;
 import ${package}.service.dto.${className}QueryCriteria;
+import me.zhengjie.utils.PageResult;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.List;
@@ -38,7 +39,7 @@ public interface ${className}Service {
     * @param pageable 分页参数
     * @return Map<String,Object>
     */
-    Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable);
+    PageResult<${className}Dto> queryAll(${className}QueryCriteria criteria, Pageable pageable);
 
     /**
     * 查询所有数据不分页

eladmin-system/src/main/resources/template/generator/admin/ServiceImpl.ftl

@@ -45,6 +45,7 @@ import cn.hutool.core.util.IdUtil;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.PageResult;
 import me.zhengjie.utils.QueryHelp;
 import java.util.List;
 import java.util.Map;
@@ -67,9 +68,9 @@ public class ${className}ServiceImpl implements ${className}Service {
     private final ${className}Mapper ${changeClassName}Mapper;
 
     @Override
-    public Map<String,Object> queryAll(${className}QueryCriteria criteria, Pageable pageable){
+    public PageResult<${className}Dto> queryAll(${className}QueryCriteria criteria, Pageable pageable){
         Page<${className}> page = ${changeClassName}Repository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(${changeClassName}Mapper::toDto));
+        return PageUtil.toPageResult(page.map(${changeClassName}Mapper::toDto));
     }
 
     @Override