diff --git a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java index 8495f50..3cbfb80 100644 --- a/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java +++ b/src/main/java/com/sqx/modules/shipinquan/content/app/AppShipinquanController.java @@ -34,14 +34,11 @@ public class AppShipinquanController { @GetMapping("/list") @ApiOperation("获取视频数据列表") public Result list(BlShipinquan entity, Integer page, Integer limit){ - QueryWrapper qw = new QueryWrapper<>(); - qw.orderByDesc("create_time"); if(page==null){ page=1; limit=10; } - IPage pageList = service.page(new Page<>(page,limit),qw); - return Result.success().put("data",pageList); + return service.findPage(page,limit,entity); } @PostMapping("/add") diff --git a/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java b/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java index f141f3b..1bf7b3f 100644 --- a/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java +++ b/src/main/java/com/sqx/modules/shipinquan/dao/BlShipinquanDao.java @@ -1,10 +1,14 @@ package com.sqx.modules.shipinquan.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sqx.modules.bl.order.entity.UserPackage; import com.sqx.modules.shipinquan.entity.BlShipinquan; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface BlShipinquanDao extends BaseMapper { - + IPage findPage(Page page, @Param("params") BlShipinquan entity); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java b/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java index 0b39ee6..d66e38d 100644 --- a/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java +++ b/src/main/java/com/sqx/modules/shipinquan/service/BlShipinquanService.java @@ -1,8 +1,9 @@ package com.sqx.modules.shipinquan.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.common.utils.Result; import com.sqx.modules.shipinquan.entity.BlShipinquan; public interface BlShipinquanService extends IService { - + Result findPage(Integer page, Integer limit, BlShipinquan entity); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java b/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java index 039a228..eefb06b 100644 --- a/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java +++ b/src/main/java/com/sqx/modules/shipinquan/service/impl/BlShipinquanServiceImpl.java @@ -1,6 +1,9 @@ package com.sqx.modules.shipinquan.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.utils.PageUtils; +import com.sqx.common.utils.Result; import com.sqx.modules.shipinquan.dao.BlShipinquanDao; import com.sqx.modules.shipinquan.entity.BlShipinquan; import com.sqx.modules.shipinquan.service.BlShipinquanService; @@ -8,5 +11,9 @@ import org.springframework.stereotype.Service; @Service public class BlShipinquanServiceImpl extends ServiceImpl implements BlShipinquanService { - + @Override + public Result findPage(Integer page, Integer limit, BlShipinquan entity){ + Page pages=new Page<>(page,limit); + return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,entity))); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml index d5aa118..2529cab 100644 --- a/src/main/resources/mapper/shipinquan/ShipinquanDao.xml +++ b/src/main/resources/mapper/shipinquan/ShipinquanDao.xml @@ -20,5 +20,10 @@ + \ No newline at end of file