diff --git a/src/main/java/com/sqx/modules/banner/dao/BannerDao.java b/src/main/java/com/sqx/modules/banner/dao/BannerDao.java index 4710d0ac..e8b1dc80 100644 --- a/src/main/java/com/sqx/modules/banner/dao/BannerDao.java +++ b/src/main/java/com/sqx/modules/banner/dao/BannerDao.java @@ -21,6 +21,6 @@ public interface BannerDao extends BaseMapper { // List selectList(@Param("classify") Integer classify); - IPage selectBannerPage(Page page,@Param("classify") Integer classify); + List selectBanner(@Param("classify") Integer classify); } diff --git a/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java b/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java index c6a4ed5f..053132a5 100644 --- a/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java +++ b/src/main/java/com/sqx/modules/banner/service/impl/BannerServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.banner.dao.BannerDao; @@ -53,8 +55,8 @@ public class BannerServiceImpl extends ServiceImpl implements @Override public PageUtils selectBannerPage(Integer page, Integer limit, Integer classify) { - Page pages = new Page<>(page, limit); - return new PageUtils(bannerDao.selectBannerPage(pages, classify)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(bannerDao.selectBanner(classify))); } @Override diff --git a/src/main/java/com/sqx/modules/invite/dao/InviteDao.java b/src/main/java/com/sqx/modules/invite/dao/InviteDao.java index b94cf694..ff735d38 100644 --- a/src/main/java/com/sqx/modules/invite/dao/InviteDao.java +++ b/src/main/java/com/sqx/modules/invite/dao/InviteDao.java @@ -29,7 +29,7 @@ public interface InviteDao extends BaseMapper { Double selectInviteSum(@Param("state") Integer state, @Param("userId") Long userId); // IPage> selectInviteUser(Page> page, @Param("userId") Long userId,@Param("state") Integer state,@Param("userType") Integer userType); - IPage> selectInviteUser(Page> page,@Param("code") String code); + List> selectInviteUser(@Param("code") String code); Invite selectInviteByUser(@Param("userId")Long userId,@Param("inviteeUserId") Long inviteeUserId,@Param("userType") Integer userType); @@ -41,7 +41,7 @@ public interface InviteDao extends BaseMapper { Double sumInviteMoney(@Param("time")String time,@Param("flag")Integer flag); - IPage> inviteAnalysis(Page> page,@Param("time")String time,@Param("flag")Integer flag); + List> inviteAnalysis(@Param("time")String time,@Param("flag")Integer flag); } diff --git a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java index f4926807..dd964a1d 100644 --- a/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java +++ b/src/main/java/com/sqx/modules/invite/service/impl/InviteServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; 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.utils.DateUtils; import com.sqx.common.utils.PageUtils; import com.sqx.modules.app.entity.UserEntity; @@ -71,9 +73,9 @@ public class InviteServiceImpl extends ServiceImpl implements @Override public PageUtils selectInviteUser(int page, int limit, Long userId, Integer state, Integer userType) { - Page> pages = new Page<>(page, limit); UserEntity userEntity = userService.queryByUserId(userId); - return new PageUtils(inviteDao.selectInviteUser(pages, userEntity.getInvitationCode())); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(inviteDao.selectInviteUser(userEntity.getInvitationCode()))); } @Override @@ -98,8 +100,8 @@ public class InviteServiceImpl extends ServiceImpl implements @Override public PageUtils inviteAnalysis(int page, int limit, String time, Integer flag) { - Page> pages = new Page<>(page, limit); - return new PageUtils(inviteDao.inviteAnalysis(pages, time, flag)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(inviteDao.inviteAnalysis(time, flag))); } @Override diff --git a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java index d81f5eca..94a51a3e 100644 --- a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java +++ b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobLogServiceImpl.java @@ -1,11 +1,16 @@ package com.sqx.modules.job.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.job.dao.ScheduleJobLogDao; +import com.sqx.modules.job.entity.ScheduleJobEntity; import com.sqx.modules.job.entity.ScheduleJobLogEntity; import com.sqx.modules.job.service.ScheduleJobLogService; import org.apache.commons.lang.StringUtils; @@ -20,12 +25,11 @@ public class ScheduleJobLogServiceImpl extends ServiceImpl params) { String jobId = (String)params.get("jobId"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper().like(StringUtils.isNotBlank(jobId),"job_id", jobId).orderByDesc("create_time") - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper().like(StringUtils.isNotBlank(jobId),"job_id", jobId).orderByDesc("create_time")))); } } diff --git a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java index 1a4f6fe6..96476189 100644 --- a/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/sqx/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -1,9 +1,12 @@ package com.sqx.modules.job.service.impl; +import cn.hutool.core.map.MapProxy; 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.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; @@ -37,12 +40,11 @@ public class ScheduleJobServiceImpl extends ServiceImpl params) { String beanName = (String)params.get("beanName"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper ().like(StringUtils.isNotBlank(beanName),"bean_name", beanName) - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper ().like(StringUtils.isNotBlank(beanName),"bean_name", beanName)))); } diff --git a/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java b/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java index 55204d0d..f50f3d2f 100644 --- a/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java +++ b/src/main/java/com/sqx/modules/message/dao/ActivityMessageInfoDao.java @@ -7,6 +7,8 @@ import com.sqx.modules.message.entity.ActivityMessageInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author fang * @date 2020/7/9 @@ -14,11 +16,11 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface ActivityMessageInfoDao extends BaseMapper { - IPage find(Page page,@Param("state") String state); + List find(@Param("state") String state); - IPage findType(Page page,@Param("type") Integer type); + List findType(@Param("type") Integer type); - IPage findTypeByUserId(Page page,@Param("type")String type,@Param("userId") String userId); + List findTypeByUserId(@Param("type")String type,@Param("userId") String userId); Integer updateState(@Param("state") String state, @Param("id") Long id); diff --git a/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java index 1a295a77..c5c61987 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/ActivityMessageServiceImpl.java @@ -2,6 +2,8 @@ package com.sqx.modules.message.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.message.dao.ActivityMessageInfoDao; import com.sqx.modules.message.entity.ActivityMessageInfo; @@ -54,8 +56,8 @@ public class ActivityMessageServiceImpl extends ServiceImpl pages = new Page<>(page, limit); - return new PageUtils(activityMessageInfoDao.find(pages,state)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(activityMessageInfoDao.find(state))); } @Override @@ -67,8 +69,8 @@ public class ActivityMessageServiceImpl extends ServiceImpl pages = new Page<>(page, limit); - return new PageUtils(activityMessageInfoDao.findType(pages,type)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(activityMessageInfoDao.findType(type))); } @Override @@ -85,8 +87,8 @@ public class ActivityMessageServiceImpl extends ServiceImpl pages = new Page<>(page, limit); - return new PageUtils(activityMessageInfoDao.findTypeByUserId(pages,type,userId)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(activityMessageInfoDao.findTypeByUserId(type,userId))); } diff --git a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java index 38152573..f8cbc325 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java @@ -1,14 +1,20 @@ package com.sqx.modules.message.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.app.service.UserService; +import com.sqx.modules.job.entity.ScheduleJobLogEntity; import com.sqx.modules.message.dao.MessageInfoDao; import com.sqx.modules.message.entity.MessageInfo; import com.sqx.modules.message.service.MessageService; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,20 +44,22 @@ public class MessageServiceImpl extends ServiceImpl Long userId = (Long)params.get("userId"); Integer state = (Integer)params.get("state"); Integer type = (Integer)params.get("type"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .eq(userId!=null,"user_id", userId) - .eq(state!=null,"state", state) - .eq(type!=null,"type", type).orderByDesc("create_at") - ); - List records = page.getRecords(); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + PageUtils page = PageUtils.page(new PageInfo<>(this.list(new QueryWrapper() + .eq(userId != null, "user_id", userId) + .eq(state != null, "state", state) + .eq(type != null, "type", type).orderByDesc("create_at")))); + + List records = (List) page.getList(); for (MessageInfo messageInfo:records){ if(messageInfo.getUserId()!=null){ messageInfo.setUserEntity(userService.selectUserById(Long.parseLong(messageInfo.getUserId()))); } } - return new PageUtils(page); + return page; } @Override diff --git a/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java b/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java index 0d6bf835..066eabe7 100644 --- a/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java +++ b/src/main/java/com/sqx/modules/oss/service/impl/SysOssServiceImpl.java @@ -1,9 +1,15 @@ package com.sqx.modules.oss.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.message.entity.MessageInfo; import com.sqx.modules.oss.dao.SysOssDao; import com.sqx.modules.oss.entity.SysOssEntity; import com.sqx.modules.oss.service.SysOssService; @@ -17,11 +23,11 @@ public class SysOssServiceImpl extends ServiceImpl impl @Override public PageUtils queryPage(Map params) { - IPage page = this.page( - new Query().getPage(params) - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list())); } } diff --git a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java index 655a3000..e9acd55c 100644 --- a/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java +++ b/src/main/java/com/sqx/modules/pay/dao/CashOutDao.java @@ -42,7 +42,7 @@ public interface CashOutDao extends BaseMapper { Double selectMayMoney(@Param("userId") Long userId); - IPage selectCashOutPage(Page page, CashOut cashOut); + List selectCashOutPage(CashOut cashOut); List selectCashOutList(@Param("cashOut") CashOut cashOut); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java index ed281907..3113b267 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java @@ -13,6 +13,8 @@ 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; @@ -105,7 +107,8 @@ public class CashOutServiceImpl extends ServiceImpl impleme @Override public PageUtils selectCashOutList(Integer page, Integer limit, CashOut cashOut) { - return new PageUtils(baseMapper.selectCashOutPage(new Page<>(page, limit), cashOut)); + PageHelper.startPage(page, limit); + return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut))); } @@ -539,8 +542,8 @@ public class CashOutServiceImpl extends ServiceImpl impleme //cashOut.setState(3); long pageNum = proxy.getLong(Constant.PAGE, 1L); long pageSize = proxy.getLong(Constant.LIMIT, 10L); - IPage page = baseMapper.selectCashOutPage(new Page<>(pageNum, pageSize), cashOut); - return new PageUtils(page); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(baseMapper.selectCashOutPage(cashOut))); } @Override diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java index 4a694eaf..44696830 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysConfigServiceImpl.java @@ -1,10 +1,14 @@ 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; @@ -28,14 +32,13 @@ public class SysConfigServiceImpl extends ServiceImpl params) { String paramKey = (String)params.get("paramKey"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper() .like(StringUtils.isNotBlank(paramKey),"param_key", paramKey) - .eq("status", 1) - ); - - return new PageUtils(page); + .eq("status", 1)))); } @Override diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java index 15cf3464..85208953 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysDictServiceImpl.java @@ -1,8 +1,12 @@ 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; @@ -21,13 +25,14 @@ public class SysDictServiceImpl extends ServiceImpl i public PageUtils queryPage(Map params) { String name = (String)params.get("name"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(name),"name", name) - ); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper() + .like(StringUtils.isNotBlank(name),"name", name)))); + - return new PageUtils(page); } } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java index fe77587e..d7b012fa 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysLogServiceImpl.java @@ -1,8 +1,12 @@ 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; @@ -21,11 +25,10 @@ public class SysLogServiceImpl extends ServiceImpl impl public PageUtils queryPage(Map params) { String key = (String)params.get("key"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper().like(StringUtils.isNotBlank(key),"username", key) - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper().like(StringUtils.isNotBlank(key),"username", key)))); } } diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java index 74169715..9394c5dc 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysRoleServiceImpl.java @@ -1,8 +1,12 @@ 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; @@ -38,15 +42,13 @@ public class SysRoleServiceImpl extends ServiceImpl i public PageUtils queryPage(Map params) { String roleName = (String)params.get("roleName"); Long createUserId = (Long)params.get("createUserId"); - - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .like(StringUtils.isNotBlank(roleName),"role_name", roleName) - .eq(createUserId != null,"create_user_id", createUserId) - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper() + .like(StringUtils.isNotBlank(roleName),"role_name", roleName) + .eq(createUserId != null,"create_user_id", createUserId)))); } @Override diff --git a/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java index a0b0c868..0ceb062e 100644 --- a/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/sqx/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,8 +1,12 @@ 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; @@ -41,18 +45,17 @@ public class SysUserServiceImpl extends ServiceImpl i Long createUserId = (Long) params.get("createUserId"); Object isChannel = params.get("isChannel"); Object sysUserId = params.get("sysUserId"); - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - .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") - ); - - return new PageUtils(page); + MapProxy proxy = MapProxy.create(params); + long pageNum = proxy.getLong(Constant.PAGE, 1L); + long pageSize = proxy.getLong(Constant.LIMIT, 10L); + PageHelper.startPage((int) pageNum, (int) pageSize); + return PageUtils.page(new PageInfo<>(this.list(new QueryWrapper() + .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")))); } @Override diff --git a/src/main/resources/mapper/banner/BannerDao.xml b/src/main/resources/mapper/banner/BannerDao.xml index 9d9c71ba..13c26af2 100644 --- a/src/main/resources/mapper/banner/BannerDao.xml +++ b/src/main/resources/mapper/banner/BannerDao.xml @@ -16,7 +16,7 @@ - select * from banner where classify=#{classify} order by `sort` desc