分页

src/main/java/com/sqx/modules/pay/dao/PayDetailsDao.java

@@ -29,13 +29,13 @@ public interface PayDetailsDao extends BaseMapper<PayDetails> {
 
     int updateState(@Param("id") Long id, @Param("state") Integer state, @Param("time") String time, @Param("tradeNo") String tradeNo,@Param("thirdOrderNo") String thirdOrderNo);
 
-    IPage<Map<String, Object>> selectPayDetails(@Param("page") Page<Map<String, Object>> page, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") Long userId, @Param("state") Integer state, @Param("userName") String userName, String orderId);
+    List<Map<String, Object>> selectPayDetails(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("userId") Long userId, @Param("state") Integer state, @Param("userName") String userName, String orderId);
 
     Double selectSumPay(@Param("createTime") String createTime, @Param("endTime") String endTime, @Param("userId") Long userId);
 
     Double selectSumMember(@Param("time") String time, @Param("flag") Integer flag);
 
-    IPage<Map<String, Object>> payMemberAnalysis(Page<Map<String, Object>> page, @Param("time") String time, @Param("flag") Integer flag);
+    List<Map<String, Object>> payMemberAnalysis(@Param("time") String time, @Param("flag") Integer flag);
 
     Double selectSumPayByState(@Param("time") String time, @Param("flag") Integer flag, @Param("state") Integer state);
 

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -4,19 +4,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.map.MapProxy;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.sqx.common.exception.SqxException;
-import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.dao.MsgDao;
@@ -44,6 +40,7 @@ import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.service.SysUserService;
 import com.sqx.modules.utils.AliPayOrderUtil;
 import com.sqx.modules.utils.AmountCalUtils;
+import com.sqx.modules.utils.ParamPageUtils;
 import com.sqx.modules.utils.excel.ExcelData;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -58,7 +55,6 @@ import weixin.popular.support.TokenManager;
 
 import javax.websocket.SendResult;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -537,13 +533,11 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
 
     @Override
     public PageUtils auditPage(Map<String, Object> params) {
-        MapProxy proxy = MapProxy.create(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
         CashOut cashOut = BeanUtil.toBean(params, CashOut.class);
-        //cashOut.setState(3);
+        List<CashOut> page = baseMapper.selectCashOutPage(cashOut);
-        long pageNum = proxy.getLong(Constant.PAGE, 1L);
+        PageInfo<CashOut> pageInfo = new PageInfo<>(page);
-        long pageSize = proxy.getLong(Constant.LIMIT, 10L);
+        return PageUtils.page(pageInfo);
-        PageHelper.startPage((int) pageNum, (int) pageSize);
-        return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut)));
     }
 
     @Override

src/main/java/com/sqx/modules/pay/service/impl/PayDetailsServiceImpl.java

@@ -2,6 +2,8 @@ package com.sqx.modules.pay.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.modules.pay.dao.PayDetailsDao;
 import com.sqx.modules.pay.entity.PayDetails;
@@ -10,6 +12,7 @@ import com.sqx.modules.utils.TimeCompleteUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -27,11 +30,13 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
 
     @Override
     public PageUtils selectPayDetails(int page, int limit, String startTime, String endTime, Long userId, Integer state, String userName, String orderId) {
-        Page<Map<String, Object>> pages = new Page<>(page, limit);
+        PageHelper.startPage(page, limit);
         if (state != null && state == -1) {
             state = null;
         }
-        return new PageUtils(payDetailsDao.selectPayDetails(pages, TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state,userName,orderId));
+        List<Map<String, Object>> payDetails = payDetailsDao.selectPayDetails(TimeCompleteUtils.completeStartTime(startTime), TimeCompleteUtils.completeEndTime(endTime), userId, state, userName, orderId);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(payDetails);
+        return PageUtils.page(pageInfo);
     }
 
     @Override
@@ -44,8 +49,10 @@ public class PayDetailsServiceImpl extends ServiceImpl<PayDetailsDao, PayDetails
 
     @Override
     public PageUtils payMemberAnalysis(int page, int limit, String time, Integer flag) {
-        Page<Map<String, Object>> pages = new Page<>(page, limit);
+        PageHelper.startPage(page, limit);
-        return new PageUtils(payDetailsDao.payMemberAnalysis(pages, time, flag));
+        List<Map<String, Object>> list = payDetailsDao.payMemberAnalysis(time, flag);
+        PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
+        return PageUtils.page(pageInfo);
     }
 
     @Override

src/main/java/com/sqx/modules/sys/controller/SysConfigController.java

@@ -1,16 +1,20 @@
 package com.sqx.modules.sys.controller;
 
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.annotation.SysLog;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.common.validator.ValidatorUtils;
 import com.sqx.modules.sys.entity.SysConfigEntity;
 import com.sqx.modules.sys.service.SysConfigService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,9 +33,10 @@ public class SysConfigController extends AbstractController {
 	@GetMapping("/list")
 	@RequiresPermissions("sys:config:list")
 	public Result list(@RequestParam Map<String, Object> params){
-		PageUtils page = sysConfigService.queryPage(params);
+		PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-
+		List<SysConfigEntity> list = sysConfigService.list();
-		return Result.success().put("page", page);
+		PageInfo<SysConfigEntity> pageInfo = new PageInfo<>(list);
+		return Result.success().put("page", PageUtils.page(pageInfo));
 	}
 
 

src/main/java/com/sqx/modules/sys/controller/SysDictController.java

@@ -1,20 +1,23 @@
 package com.sqx.modules.sys.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.common.validator.ValidatorUtils;
 import com.sqx.modules.sys.entity.SysDictEntity;
 import com.sqx.modules.sys.service.SysDictService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
  * 数据字典
- *
  */
 @RestController
 @RequestMapping("sys/dict")
@@ -28,9 +31,11 @@ public class SysDictController {
     @RequestMapping("/list")
     @RequiresPermissions("sys:dict:list")
     public Result list(@RequestParam Map<String, Object> params) {
-        PageUtils page = sysDictService.queryPage(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
+        List<SysDictEntity> list = sysDictService.list();
+        PageInfo<SysDictEntity> pageInfo = new PageInfo<>(list);
 
-        return Result.success().put("page", page);
+        return Result.success().put("page", PageUtils.page(pageInfo));
     }
 
 

src/main/java/com/sqx/modules/sys/controller/SysLogController.java

@@ -1,8 +1,12 @@
 package com.sqx.modules.sys.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
+import com.sqx.modules.sys.entity.SysLogEntity;
 import com.sqx.modules.sys.service.SysLogService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -11,12 +15,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
 import java.util.Map;
 
 
 /**
  * 系统日志
- *
  */
 @Controller
 @RequestMapping("/sys/log")
@@ -31,9 +35,11 @@ public class SysLogController {
     @GetMapping("/list")
     @RequiresPermissions("sys:log:list")
     public Result list(@RequestParam Map<String, Object> params) {
-		PageUtils page = sysLogService.queryPage(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
+        List<SysLogEntity> entities = sysLogService.list();
+        PageInfo<SysLogEntity> pageInfo = new PageInfo<>(entities);
 
-		return Result.success().put("page", page);
+        return Result.success().put("page", PageUtils.page(pageInfo));
     }
 
 }

src/main/java/com/sqx/modules/sys/controller/SysRoleController.java

@@ -1,5 +1,7 @@
 package com.sqx.modules.sys.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.annotation.SysLog;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
@@ -7,6 +9,7 @@ import com.sqx.common.validator.ValidatorUtils;
 import com.sqx.modules.sys.entity.SysRoleEntity;
 import com.sqx.modules.sys.service.SysRoleMenuService;
 import com.sqx.modules.sys.service.SysRoleService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +20,6 @@ import java.util.Map;
 
 /**
  * 角色管理
- *
  */
 @RestController
 @RequestMapping("/sys/role")
@@ -37,8 +39,10 @@ public class SysRoleController extends AbstractController {
 		/*if(getUserId() != Constant.SUPER_ADMIN){
 			params.put("createUserId", getUserId());
 		}*/
-		PageUtils page = sysRoleService.queryPage(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-		return Result.success().put("page", page);
+        List<SysRoleEntity> list = sysRoleService.list();
+        PageInfo<SysRoleEntity> pageInfo = new PageInfo<>(list);
+        return Result.success().put("page", PageUtils.page(pageInfo));
     }
 
     /**

src/main/java/com/sqx/modules/sys/controller/SysUserController.java

@@ -1,5 +1,7 @@
 package com.sqx.modules.sys.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.annotation.SysLog;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
@@ -11,6 +13,7 @@ import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.form.PasswordForm;
 import com.sqx.modules.sys.service.SysUserRoleService;
 import com.sqx.modules.sys.service.SysUserService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,9 +44,10 @@ public class SysUserController extends AbstractController {
 		/*if(getUserId() != Constant.SUPER_ADMIN){
 			params.put("createUserId", getUserId());
 		}*/
-		PageUtils page = sysUserService.queryPage(params);
+		PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-
+		List<SysUserEntity> list = sysUserService.list();
-		return Result.success().put("page", page);
+		PageInfo<SysUserEntity> pageInfo = new PageInfo<>(list);
+		return Result.success().put("page", PageUtils.page(pageInfo));
 	}
 
 	/**

src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java

@@ -1,26 +1,24 @@
 package com.sqx.modules.sys.service.impl;
 
-import cn.hutool.core.map.MapProxy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
 import com.sqx.common.exception.SqxException;
-import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Query;
 import com.sqx.modules.sys.dao.SysConfigDao;
 import com.sqx.modules.sys.entity.SysConfigEntity;
 import com.sqx.modules.sys.redis.SysConfigRedis;
 import com.sqx.modules.sys.service.SysConfigService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 @Service("sysConfigService")
@@ -32,13 +30,13 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigDao, SysConfigEnt
     public PageUtils queryPage(Map<String, Object> params) {
         String paramKey = (String) params.get("paramKey");
 
-		MapProxy proxy = MapProxy.create(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-		long pageNum = proxy.getLong(Constant.PAGE, 1L);
+        List<SysConfigEntity> entityList = baseMapper.selectList(new QueryWrapper<SysConfigEntity>()
-		long pageSize = proxy.getLong(Constant.LIMIT, 10L);
-		PageHelper.startPage((int) pageNum, (int) pageSize);
-		return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysConfigEntity>()
                 .like(StringUtils.isNotBlank(paramKey), "param_key", paramKey)
-				.eq("status", 1))));
+                .eq("status", 1)
+        );
+        PageInfo<SysConfigEntity> pageInfo = new PageInfo<>(entityList);
+        return PageUtils.page(pageInfo);
     }
 
     @Override

src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java

@@ -1,20 +1,18 @@
 package com.sqx.modules.sys.service.impl;
 
-import cn.hutool.core.map.MapProxy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Query;
 import com.sqx.modules.sys.dao.SysDictDao;
 import com.sqx.modules.sys.entity.SysDictEntity;
 import com.sqx.modules.sys.service.SysDictService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -25,14 +23,12 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictDao, SysDictEntity> i
     public PageUtils queryPage(Map<String, Object> params) {
         String name = (String) params.get("name");
 
-        MapProxy proxy = MapProxy.create(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-        long pageNum = proxy.getLong(Constant.PAGE, 1L);
+        List<SysDictEntity> entityList = baseMapper.selectList(new QueryWrapper<SysDictEntity>()
-        long pageSize = proxy.getLong(Constant.LIMIT, 10L);
+                .like(StringUtils.isNotBlank(name), "name", name)
-        PageHelper.startPage((int) pageNum, (int) pageSize);
+        );
-        return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysDictEntity>()
+        PageInfo<SysDictEntity> pageInfo = new PageInfo<>(entityList);
-                .like(StringUtils.isNotBlank(name),"name", name))));
+        return PageUtils.page(pageInfo);
-
-
     }
 
 }

src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java

@@ -1,20 +1,18 @@
 package com.sqx.modules.sys.service.impl;
 
-import cn.hutool.core.map.MapProxy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Query;
 import com.sqx.modules.sys.dao.SysLogDao;
 import com.sqx.modules.sys.entity.SysLogEntity;
 import com.sqx.modules.sys.service.SysLogService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -25,10 +23,9 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogDao, SysLogEntity> impl
     public PageUtils queryPage(Map<String, Object> params) {
         String key = (String) params.get("key");
 
-        MapProxy proxy = MapProxy.create(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-        long pageNum = proxy.getLong(Constant.PAGE, 1L);
+        List<SysLogEntity> list = baseMapper.selectList(new QueryWrapper<SysLogEntity>().like(StringUtils.isNotBlank(key), "username", key));
-        long pageSize = proxy.getLong(Constant.LIMIT, 10L);
+        PageInfo<SysLogEntity> pageInfo = new PageInfo<>(list);
-        PageHelper.startPage((int) pageNum, (int) pageSize);
+        return PageUtils.page(pageInfo);
-        return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysLogEntity>().like(StringUtils.isNotBlank(key),"username", key))));
     }
 }

src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java

@@ -1,20 +1,16 @@
 package com.sqx.modules.sys.service.impl;
 
-import cn.hutool.core.map.MapProxy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Query;
 import com.sqx.modules.sys.dao.SysRoleDao;
 import com.sqx.modules.sys.entity.SysRoleEntity;
 import com.sqx.modules.sys.service.SysRoleMenuService;
 import com.sqx.modules.sys.service.SysRoleService;
 import com.sqx.modules.sys.service.SysUserRoleService;
-import com.sqx.modules.sys.service.SysUserService;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,21 +30,19 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleDao, SysRoleEntity> i
 	@Autowired
 	private SysRoleMenuService sysRoleMenuService;
     @Autowired
-	private SysUserService sysUserService;
-    @Autowired
     private SysUserRoleService sysUserRoleService;
 
 	@Override
 	public PageUtils queryPage(Map<String, Object> params) {
 		String roleName = (String)params.get("roleName");
 		Long createUserId = (Long)params.get("createUserId");
-        MapProxy proxy = MapProxy.create(params);
+
-        long pageNum = proxy.getLong(Constant.PAGE, 1L);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-        long pageSize = proxy.getLong(Constant.LIMIT, 10L);
+        List<SysRoleEntity> sysRoleEntities = baseMapper.selectList(new QueryWrapper<SysRoleEntity>()
-        PageHelper.startPage((int) pageNum, (int) pageSize);
-        return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysRoleEntity>()
                 .like(StringUtils.isNotBlank(roleName), "role_name", roleName)
-                .eq(createUserId != null,"create_user_id", createUserId))));
+                .eq(createUserId != null, "create_user_id", createUserId));
+        PageInfo<SysRoleEntity> pageInfo = new PageInfo<>(sysRoleEntities);
+        return PageUtils.page(pageInfo);
 	}
 
     @Override

src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java

@@ -1,20 +1,17 @@
 package com.sqx.modules.sys.service.impl;
 
-import cn.hutool.core.map.MapProxy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
-import com.sqx.common.utils.Query;
 import com.sqx.modules.sys.dao.SysUserDao;
 import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.service.SysRoleService;
 import com.sqx.modules.sys.service.SysUserRoleService;
 import com.sqx.modules.sys.service.SysUserService;
 import com.sqx.modules.utils.InvitationCodeUtil;
+import com.sqx.modules.utils.ParamPageUtils;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.crypto.hash.Sha256Hash;
@@ -45,17 +42,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
         Long createUserId = (Long) params.get("createUserId");
         Object isChannel = params.get("isChannel");
         Object sysUserId = params.get("sysUserId");
-        MapProxy proxy = MapProxy.create(params);
+        PageHelper.startPage(ParamPageUtils.getPageNum(params), ParamPageUtils.getPageSize(params));
-        long pageNum = proxy.getLong(Constant.PAGE, 1L);
+        List<SysUserEntity> sysUserEntities = baseMapper.selectList(new QueryWrapper<SysUserEntity>()
-        long pageSize = proxy.getLong(Constant.LIMIT, 10L);
-        PageHelper.startPage((int) pageNum, (int) pageSize);
-        return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper<SysUserEntity>()
                 .like(StringUtils.isNotBlank(username), "username", username)
                 .eq(createUserId != null, "create_user_id", createUserId)
                 .eq(isChannel != null, "is_channel", isChannel)
                 .eq(sysUserId != null, "sys_user_id", sysUserId)
                 .isNull(sysUserId == null, "sys_user_id")
-                .isNull(isChannel == null, "is_channel"))));
+                .isNull(isChannel == null, "is_channel"));
+        PageInfo<SysUserEntity> pageInfo = new PageInfo<>(sysUserEntities);
+        return PageUtils.page(pageInfo);
     }
 
     @Override

src/main/java/com/sqx/modules/urlAddress/controller/UrlAddressController.java

@@ -2,6 +2,8 @@ package com.sqx.modules.urlAddress.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.sqx.common.utils.DateUtils;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
@@ -15,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 @RestController
 @Api(value = "域名池", tags = {"域名池"})
@@ -49,9 +52,11 @@ public class UrlAddressController extends AbstractController {
     @GetMapping("/selectUrlAddressList")
     @ApiOperation("查询域名池列表")
     public Result selectUrlAddressList(Integer page,Integer limit,String urlAddress,Integer status){
-        return Result.success().put("data",new PageUtils(urlAddressService.page(new Page<>(page,limit),
+        PageHelper.startPage(page,limit);
-                new QueryWrapper<UrlAddress>().like(StringUtils.isNotEmpty(urlAddress),"url_address",urlAddress)
+        List<UrlAddress> list = urlAddressService.list(new QueryWrapper<UrlAddress>().like(StringUtils.isNotEmpty(urlAddress), "url_address", urlAddress)
-                        .eq(status!=null && status!=0,"status",status))));
+                .eq(status != null && status != 0, "status", status));
+        PageInfo<UrlAddress> pageInfo = new PageInfo<>(list);
+        return Result.success().put("data", PageUtils.page(pageInfo));
     }
 
     @GetMapping("/selectUrlAddress")