PageUtil 优化

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

@@ -15,7 +15,7 @@
  */
 package me.zhengjie.utils;
 
-import org.springframework.data.domain.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.*;
 
 /**
@@ -23,6 +23,7 @@ import java.util.*;
  * @author Zheng Jie
  * @date 2018-12-10
  */
+@SuppressWarnings({"unchecked","all"})
 public class PageUtil extends cn.hutool.core.util.PageUtil {
 
     /**
@@ -41,12 +42,32 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
     }
 
     /**
-     * Page 数据处理，预防redis反序列化报错
+     * Page 数据处理
      */
-    public static Map<String,Object> toPage(Page page) {
+    public static Map<String,Object> toPage(IPage page) {
         Map<String,Object> map = new LinkedHashMap<>(2);
-        map.put("content",page.getContent());
+        map.put("content",page.getRecords());
-        map.put("totalElements",page.getTotalElements());
+        map.put("totalElements",page.getTotal());
+        return map;
+    }
+
+    /**
+     * 自定义分页
+     */
+    public static Map<String,Object> toPage(List list) {
+        Map<String,Object> map = new LinkedHashMap<>(2);
+        map.put("content",list);
+        map.put("totalElements",list.size());
+        return map;
+    }
+
+    /**
+     * 返回空数据
+     */
+    public static Map<String,Object> noData () {
+        Map<String,Object> map = new LinkedHashMap<>(2);
+        map.put("content",null);
+        map.put("totalElements",0);
         return map;
     }
 
@@ -59,5 +80,4 @@ public class PageUtil extends cn.hutool.core.util.PageUtil {
         map.put("totalElements",totalElements);
         return map;
     }
-
 }

eladmin/eladmin-generator/src/main/java/me/zhengjie/rest/GeneratorController.java

@@ -58,7 +58,7 @@ public class GeneratorController {
     @GetMapping(value = "/columns")
     public ResponseEntity<Object> queryColumns(@RequestParam String tableName){
         List<ColumnInfo> columnInfos = generatorService.getColumns(tableName);
-        return new ResponseEntity<>(PageUtil.toPage(columnInfos,columnInfos.size()), HttpStatus.OK);
+        return new ResponseEntity<>(PageUtil.toPage(columnInfos), HttpStatus.OK);
     }
 
     @ApiOperation("保存字段数据")

eladmin/eladmin-generator/src/main/java/me/zhengjie/service/GeneratorService.java

@@ -20,10 +20,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import me.zhengjie.domain.GenConfig;
 import me.zhengjie.domain.ColumnInfo;
 import org.springframework.http.ResponseEntity;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Zheng Jie
@@ -38,7 +38,7 @@ public interface GeneratorService extends IService<ColumnInfo> {
      * @param page 分页参数
      * @return /
      */
-    Object getTables(String name, Page<Object> page);
+    Map<String,Object> getTables(String name, Page<Object> page);
 
     /**
      * 得到数据表的元数据

eladmin/eladmin-generator/src/main/java/me/zhengjie/service/impl/GeneratorServiceImpl.java

@@ -17,14 +17,12 @@ package me.zhengjie.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ZipUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import me.zhengjie.domain.GenConfig;
 import me.zhengjie.domain.ColumnInfo;
-import me.zhengjie.domain.vo.TableInfo;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.mapper.ColumnInfoMapper;
 import me.zhengjie.service.GeneratorService;
@@ -57,9 +55,8 @@ public class GeneratorServiceImpl extends ServiceImpl<ColumnInfoMapper, ColumnIn
     private final String CONFIG_MESSAGE = "请先配置生成器";
 
     @Override
-    public Object getTables(String name, Page<Object> page) {
+    public Map<String,Object> getTables(String name, Page<Object> page) {
-        IPage<TableInfo> result = columnInfoMapper.getTables(name, page);
+        return PageUtil.toPage(columnInfoMapper.getTables(name, page));
-        return PageUtil.toPage(result.getRecords(), result.getTotal());
     }
 
     @Override

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

@@ -27,7 +27,6 @@ import me.zhengjie.exception.EntityExistException;
 </#if>
 import me.zhengjie.utils.FileUtil;
 import lombok.RequiredArgsConstructor;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import ${package}.service.${className}Service;
@@ -56,8 +55,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
 
     @Override
     public Map<String,Object> queryAll(${className}QueryCriteria criteria, Page<Object> page){
-        IPage<${className}> ${changeClassName}Data = ${changeClassName}Mapper.findAll(criteria, page);
+        return PageUtil.toPage(${changeClassName}Mapper.findAll(criteria, page));
-        return PageUtil.toPage(${changeClassName}Data.getRecords(), ${changeClassName}Data.getTotal());
     }
 
     @Override

eladmin/eladmin-logging/src/main/java/me/zhengjie/service/SysLogService.java

@@ -24,6 +24,7 @@ import org.springframework.scheduling.annotation.Async;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Zheng Jie
@@ -37,7 +38,7 @@ public interface SysLogService extends IService<SysLog>{
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(SysLogQueryCriteria criteria, Page<SysLog> page);
+    Map<String,Object> queryAll(SysLogQueryCriteria criteria, Page<SysLog> page);
 
     /**
      * 查询全部数据
@@ -52,7 +53,7 @@ public interface SysLogService extends IService<SysLog>{
      * @param page 分页参数
      * @return -
      */
-    Object queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page);
+    Map<String,Object> queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page);
 
     /**
      * 保存日志数据

eladmin/eladmin-logging/src/main/java/me/zhengjie/service/impl/SysLogServiceImpl.java

@@ -18,7 +18,6 @@ package me.zhengjie.service.impl;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -49,9 +48,8 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
     private final SysLogMapper sysLogMapper;
 
     @Override
-    public Object queryAll(SysLogQueryCriteria criteria, Page<SysLog> page) {
+    public Map<String,Object> queryAll(SysLogQueryCriteria criteria, Page<SysLog> page) {
-        IPage<SysLog> data = sysLogMapper.queryAll(criteria, page);
+        return PageUtil.toPage(sysLogMapper.queryAll(criteria, page));
-        return PageUtil.toPage(data.getRecords(), data.getTotal());
     }
 
     @Override
@@ -60,9 +58,8 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
     }
 
     @Override
-    public Object queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page) {
+    public Map<String,Object> queryAllByUser(SysLogQueryCriteria criteria, Page<SysLog> page) {
-        IPage<SysLog> data = sysLogMapper.queryAllByUser(criteria, page);
+        return PageUtil.toPage(sysLogMapper.queryAllByUser(criteria, page));
-        return PageUtil.toPage(data.getRecords(), data.getTotal());
     }
 
     @Override

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

@@ -22,6 +22,7 @@ import me.zhengjie.modules.mnt.domain.vo.AppQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -36,7 +37,7 @@ public interface AppService extends IService<App> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(AppQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(AppQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

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

@@ -22,6 +22,7 @@ import me.zhengjie.modules.mnt.domain.vo.DatabaseQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -36,7 +37,7 @@ public interface DatabaseService extends IService<Database> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(DatabaseQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(DatabaseQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

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

@@ -22,6 +22,7 @@ import me.zhengjie.modules.mnt.domain.vo.DeployHistoryQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -35,7 +36,7 @@ public interface DeployHistoryService extends IService<DeployHistory> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

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

@@ -23,6 +23,7 @@ import me.zhengjie.modules.mnt.domain.vo.DeployQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -37,7 +38,7 @@ public interface DeployService extends IService<Deploy> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(DeployQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(DeployQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

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

@@ -22,6 +22,7 @@ import me.zhengjie.modules.mnt.domain.vo.ServerQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -36,7 +37,7 @@ public interface ServerService extends IService<Server> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(ServerQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(ServerQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

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

@@ -15,7 +15,6 @@
  */
 package me.zhengjie.modules.mnt.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -47,9 +46,8 @@ public class AppServiceImpl extends ServiceImpl<AppMapper, App> implements AppSe
     private final DeployServerMapper deployServerMapper;
 
     @Override
-    public Object queryAll(AppQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(AppQueryCriteria criteria, Page<Object> page){
-        IPage<App> apps = appMapper.queryAll(criteria, page);
+        return PageUtil.toPage(appMapper.queryAll(criteria, page));
-        return PageUtil.toPage(apps.getRecords(), apps.getTotal());
     }
 
     @Override

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

@@ -16,7 +16,6 @@
 package me.zhengjie.modules.mnt.service.impl;
 
 import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -46,9 +45,8 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseMapper, Database> i
     private final DatabaseMapper databaseMapper;
 
     @Override
-    public Object queryAll(DatabaseQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(DatabaseQueryCriteria criteria, Page<Object> page){
-        IPage<Database> databases = databaseMapper.findAll(criteria, page);
+        return PageUtil.toPage(databaseMapper.findAll(criteria, page));
-        return PageUtil.toPage(databases.getRecords(), databases.getTotal());
     }
 
     @Override

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

@@ -16,7 +16,6 @@
 package me.zhengjie.modules.mnt.service.impl;
 
 import cn.hutool.core.util.IdUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -44,9 +43,8 @@ public class DeployHistoryServiceImpl extends ServiceImpl<DeployHistoryMapper, D
     private final DeployHistoryMapper deployhistoryMapper;
 
     @Override
-    public Object queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(DeployHistoryQueryCriteria criteria, Page<Object> page){
-        IPage<DeployHistory> deployHistories = deployhistoryMapper.findAll(criteria, page);
+        return PageUtil.toPage(deployhistoryMapper.findAll(criteria, page));
-        return PageUtil.toPage(deployHistories.getRecords(), deployHistories.getTotal());
     }
 
     @Override

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

@@ -17,7 +17,6 @@ package me.zhengjie.modules.mnt.service.impl;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -66,7 +65,7 @@ public class DeployServiceImpl extends ServiceImpl<DeployMapper, Deploy> impleme
 
 
 	@Override
-	public Object queryAll(DeployQueryCriteria criteria, Page<Object> page) {
+	public Map<String,Object> queryAll(DeployQueryCriteria criteria, Page<Object> page) {
 		criteria.setOffset(page.offset());
 		List<Deploy> deploys = deployMapper.findAll(criteria);
 		Long total = deployMapper.countAll(criteria);

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

@@ -15,7 +15,6 @@
  */
 package me.zhengjie.modules.mnt.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -45,9 +44,8 @@ public class ServerServiceImpl extends ServiceImpl<ServerMapper, Server> impleme
     private final DeployServerMapper deployServerMapper;
 
     @Override
-    public Object queryAll(ServerQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(ServerQueryCriteria criteria, Page<Object> page){
-        IPage<Server> serverDeploys = serverMapper.findAll(criteria, page);
+        return PageUtil.toPage(serverMapper.findAll(criteria, page));
-        return PageUtil.toPage(serverDeploys.getRecords(), serverDeploys.getTotal());
     }
 
     @Override

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

@@ -23,6 +23,7 @@ import me.zhengjie.modules.quartz.domain.vo.QuartzJobQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -37,7 +38,7 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(QuartzJobQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部
@@ -52,7 +53,7 @@ public interface QuartzJobService extends IService<QuartzJob> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

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

@@ -17,7 +17,6 @@ package me.zhengjie.modules.quartz.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -52,15 +51,14 @@ public class QuartzJobServiceImpl extends ServiceImpl<QuartzJobMapper, QuartzJob
     private final RedisUtils redisUtils;
 
     @Override
-    public Object queryAll(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(QuartzJobQueryCriteria criteria, Page<Object> page){
-        IPage<QuartzJob> quartzJobs = quartzJobMapper.findAll(criteria, page);
+        return PageUtil.toPage(quartzJobMapper.findAll(criteria, page));
-        return PageUtil.toPage(quartzJobs.getRecords(), quartzJobs.getTotal());
     }
 
     @Override
-    public Object queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAllLog(QuartzJobQueryCriteria criteria, Page<Object> page){
-        IPage<QuartzLog> quartzJobs = quartzLogMapper.findAll(criteria, page);
+        return PageUtil.toPage(quartzLogMapper.findAll(criteria, page));
-        return PageUtil.toPage(quartzJobs.getRecords(), quartzJobs.getTotal());    }
+    }
 
     @Override
     public List<QuartzJob> queryAll(QuartzJobQueryCriteria criteria) {

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/DeptController.java

@@ -57,8 +57,8 @@ public class DeptController {
     @GetMapping
     @PreAuthorize("@el.check('user:list','dept:list')")
     public ResponseEntity<Object> queryDept(DeptQueryCriteria criteria) throws Exception {
-        List<Dept> deptDtos = deptService.queryAll(criteria, true);
+        List<Dept> depts = deptService.queryAll(criteria, true);
-        return new ResponseEntity<>(PageUtil.toPage(deptDtos, deptDtos.size()),HttpStatus.OK);
+        return new ResponseEntity<>(PageUtil.toPage(depts),HttpStatus.OK);
     }
 
     @ApiOperation("查询部门:根据ID获取同级与上级数据")

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java

@@ -88,7 +88,7 @@ public class MenuController {
     @PreAuthorize("@el.check('menu:list')")
     public ResponseEntity<Object> queryMenu(MenuQueryCriteria criteria) throws Exception {
         List<Menu> menuList = menuService.queryAll(criteria, true);
-        return new ResponseEntity<>(PageUtil.toPage(menuList, menuList.size()),HttpStatus.OK);
+        return new ResponseEntity<>(PageUtil.toPage(menuList),HttpStatus.OK);
     }
 
     @ApiOperation("查询菜单:根据ID获取同级与上级数据")

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java

@@ -98,7 +98,7 @@ public class UserController {
             criteria.getDeptIds().addAll(dataScopes);
             return new ResponseEntity<>(userService.queryAll(criteria,page),HttpStatus.OK);
         }
-        return new ResponseEntity<>(PageUtil.toPage(null,0),HttpStatus.OK);
+        return new ResponseEntity<>(PageUtil.noData(),HttpStatus.OK);
     }
 
     @Log("新增用户")

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

@@ -24,6 +24,7 @@ import me.zhengjie.modules.system.domain.vo.RoleQueryCriteria;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -89,7 +90,7 @@ public interface RoleService extends IService<Role> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(RoleQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(RoleQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

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

@@ -101,7 +101,7 @@ public interface UserService extends IService<User> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(UserQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(UserQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部不分页

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

@@ -15,7 +15,6 @@
  */
 package me.zhengjie.modules.system.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -48,8 +47,7 @@ public class DictDetailServiceImpl extends ServiceImpl<DictDetailMapper, DictDet
 
     @Override
     public Map<String,Object> queryAll(DictDetailQueryCriteria criteria, Page<Object> page) {
-        IPage<DictDetail> details = dictDetailMapper.findAll(criteria, page);
+        return PageUtil.toPage(dictDetailMapper.findAll(criteria, page));
-        return PageUtil.toPage(details.getRecords(), details.getTotal());
     }
 
     @Override

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

@@ -15,7 +15,6 @@
  */
 package me.zhengjie.modules.system.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -51,8 +50,7 @@ public class JobServiceImpl extends ServiceImpl<JobMapper, Job> implements JobSe
 
     @Override
     public Map<String,Object> queryAll(JobQueryCriteria criteria, Page<Object> page) {
-        IPage<Job> jobs = jobMapper.findAll(criteria, page);
+        return PageUtil.toPage(jobMapper.findAll(criteria, page));
-        return PageUtil.toPage(jobs.getRecords(), jobs.getTotal());
     }
 
     @Override

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

@@ -69,7 +69,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements Ro
     }
 
     @Override
-    public Object queryAll(RoleQueryCriteria criteria, Page<Object> page) {
+    public Map<String,Object> queryAll(RoleQueryCriteria criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<Role> roles = roleMapper.findAll(criteria);
         Long total = roleMapper.countAll(criteria);

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

@@ -63,7 +63,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private final OnlineUserService onlineUserService;
 
     @Override
-    public Object queryAll(UserQueryCriteria criteria, Page<Object> page) {
+    public Map<String,Object> queryAll(UserQueryCriteria criteria, Page<Object> page) {
         criteria.setOffset(page.offset());
         List<User> users = userMapper.findAll(criteria);
         Long total = userMapper.countAll(criteria);

eladmin/eladmin-system/src/main/resources/config/application.yml

@@ -26,7 +26,7 @@ spring:
 
   redis:
     #数据库索引
-    database: ${REDIS_DB:0}
+    database: ${REDIS_DB:1}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java

@@ -23,6 +23,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author Zheng Jie
@@ -36,7 +37,7 @@ public interface LocalStorageService extends IService<LocalStorage> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(LocalStorageQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部数据

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/QiniuContentService.java

@@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Zheng Jie
@@ -37,7 +38,7 @@ public interface QiniuContentService extends IService<QiniuContent> {
      * @param page 分页参数
      * @return /
      */
-    Object queryAll(QiniuQueryCriteria criteria, Page<Object> page);
+    Map<String,Object> queryAll(QiniuQueryCriteria criteria, Page<Object> page);
 
     /**
      * 查询全部

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/LocalStorageServiceImpl.java

@@ -16,7 +16,6 @@
 package me.zhengjie.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -50,9 +49,8 @@ public class LocalStorageServiceImpl extends ServiceImpl<LocalStorageMapper, Loc
     private final FileProperties properties;
 
     @Override
-    public Object queryAll(LocalStorageQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(LocalStorageQueryCriteria criteria, Page<Object> page){
-        IPage<LocalStorage> localStorages = localStorageMapper.findAll(criteria, page);
+        return PageUtil.toPage(localStorageMapper.findAll(criteria, page));
-        return PageUtil.toPage(localStorages.getRecords(), localStorages.getTotal());
     }
 
     @Override

eladmin/eladmin-tools/src/main/java/me/zhengjie/service/impl/QiniuContentServiceImpl.java

@@ -16,7 +16,6 @@
 package me.zhengjie.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qiniu.common.QiniuException;
@@ -61,9 +60,8 @@ public class QiniuContentServiceImpl extends ServiceImpl<QiniuContentMapper, Qin
     private Long maxSize;
 
     @Override
-    public Object queryAll(QiniuQueryCriteria criteria, Page<Object> page){
+    public Map<String,Object> queryAll(QiniuQueryCriteria criteria, Page<Object> page){
-        IPage<QiniuContent> qiniuContents = qiniuContentMapper.findAll(criteria, page);
+        return PageUtil.toPage(qiniuContentMapper.findAll(criteria, page));
-        return PageUtil.toPage(qiniuContents.getRecords(), qiniuContents.getTotal());
     }
 
     @Override