diff --git a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java index 51bcc103..2e473400 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -3,6 +3,7 @@ package com.peanut.modules.book.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.Query; import com.peanut.common.utils.R; @@ -12,6 +13,7 @@ import com.peanut.modules.book.entity.UserEbookBuyEntity; import com.peanut.modules.book.service.BookMedicalRecordsService; import com.peanut.modules.book.service.BookService; import com.peanut.modules.book.service.UserEbookBuyService; +import com.peanut.modules.book.vo.UserOrderVo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -56,11 +58,11 @@ public class BookMedicalRecordsController { */ @RequestMapping("/recommendBookList") public R recommendBookList(@RequestBody Map params){ - List list = bookMedicalRecordsService.getBooks((Integer) params.get("userId")); - MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); - IPage page = bookService.page( - new Query().getPage(params),wrapper); + List list = bookMedicalRecordsService.getBooks(params); + Page page = new Page<>(); page.setRecords(list); + page.setTotal(list.size()); + page.setPages(Math.round(list.size()/page.getSize())); return R.ok().put("page", page); } /** diff --git a/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java b/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java index 75de02a2..baa005e5 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java @@ -13,6 +13,6 @@ public interface BookMedicalRecordsDao extends MPJBaseMapper getBooks(Integer userId); + List getBooks(Integer page,Integer limit,Integer userId); } diff --git a/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java b/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java index 2cfe3eb1..c9d6c745 100644 --- a/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java +++ b/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java @@ -12,6 +12,6 @@ import java.util.Map; public interface BookMedicalRecordsService extends IService { - List getBooks(Integer userId); + List getBooks(Map params); } diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java index 77eb7d97..7164dd0f 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BookMedicalRecordsServiceImpl.java @@ -24,7 +24,10 @@ public class BookMedicalRecordsServiceImpl extends ServiceImpl getBooks(Integer userId) { - return dao.getBooks(userId); + public List getBooks(Map params) { + int page = Integer.parseInt(params.get("page").toString()); + int limit = Integer.parseInt(params.get("limit").toString()); + return dao.getBooks((page-1)*limit,limit + ,(Integer)params.get("userId")); } } diff --git a/src/main/resources/mapper/book/BookMedicalRecordsDao.xml b/src/main/resources/mapper/book/BookMedicalRecordsDao.xml index a99ac9a6..eea7562b 100644 --- a/src/main/resources/mapper/book/BookMedicalRecordsDao.xml +++ b/src/main/resources/mapper/book/BookMedicalRecordsDao.xml @@ -20,6 +20,7 @@ where bmr.book_id not in (select book_id from user_ebook_buy where user_id = #{userId}) and b.del_flag = 0 and b.state = 1 GROUP BY bmr.book_id + limit #{page},#{limit} \ No newline at end of file