diff --git a/play-admin/src/main/java/com/starry/admin/common/PageBuilder.java b/play-admin/src/main/java/com/starry/admin/common/PageBuilder.java new file mode 100644 index 0000000..61daf88 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/common/PageBuilder.java @@ -0,0 +1,21 @@ +package com.starry.admin.common; + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + + +public class PageBuilder { + public static final String PAGE_NUM = "pageNum"; + + public static final String PAGE_SIZE = "pageSize"; + + public static Page build() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + Integer pageNum = Integer.valueOf(attributes.getRequest().getParameter(PAGE_NUM)); + Integer pageSize = Integer.valueOf(attributes.getRequest().getParameter(PAGE_SIZE)); + return new Page<>(pageNum, pageSize); + } + +} diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayGiftInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayGiftInfoServiceImpl.java index 68a9f4d..7e06cb9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayGiftInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayGiftInfoServiceImpl.java @@ -6,6 +6,7 @@ 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.yulichang.wrapper.MPJLambdaWrapper; +import com.starry.admin.common.PageBuilder; import com.starry.admin.common.exception.CustomException; import com.starry.admin.modules.custom.module.entity.PlayCustomGiftInfoEntity; import com.starry.admin.modules.custom.service.IPlayCustomGiftInfoService; @@ -22,6 +23,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import javax.annotation.Resource; + +import com.starry.common.utils.StringUtils; import org.springframework.stereotype.Service; /** @@ -165,8 +168,11 @@ public class PlayGiftInfoServiceImpl extends ServiceImpl selectPlayGiftInfoByPage(PlayGiftInfoEntity playGiftInfo) { - Page page = new Page<>(1, 10); - return this.baseMapper.selectPage(page, new LambdaQueryWrapper<>()); + Page page = PageBuilder.build(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(playGiftInfo.getName()), PlayGiftInfoEntity::getName, playGiftInfo.getName()); + wrapper.eq(StringUtils.isNotBlank(playGiftInfo.getState()), PlayGiftInfoEntity::getState, playGiftInfo.getState()); + return this.baseMapper.selectPage(page, wrapper); } /**