From d33f24113cac070683002e0ed4174b075f057498 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 24 Nov 2023 14:50:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BookMedicalRecordsController.java | 12 +----------- .../book/entity/BookMedicalRecordsEntity.java | 6 ++---- 2 files changed, 3 insertions(+), 15 deletions(-) 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 9164f37e..d5dac974 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -64,12 +64,6 @@ public class BookMedicalRecordsController { @RequestMapping("/saveOrUpdate") public R save(@RequestBody BookMedicalRecordsEntity entity){ try { - if (entity.getSort()==null){ - entity.setSort(1); - } - if (entity.getDelFlag()==null){ - entity.setDelFlag(0); - } bookMedicalRecordsService.saveOrUpdate(entity); return R.ok(); }catch (Exception e) { @@ -82,11 +76,7 @@ public class BookMedicalRecordsController { @RequestMapping("/del") public R del(Integer medicalRecordsId){ try { - BookMedicalRecordsEntity entity = bookMedicalRecordsService.getOne( - new QueryWrapper() - .eq("medical_records_id", medicalRecordsId)); - entity.setDelFlag(1); - bookMedicalRecordsService.updateById(entity); + bookMedicalRecordsService.removeById(medicalRecordsId); return R.ok(); }catch (Exception e) { return R.error("删除失败:"+e.getMessage()); diff --git a/src/main/java/com/peanut/modules/book/entity/BookMedicalRecordsEntity.java b/src/main/java/com/peanut/modules/book/entity/BookMedicalRecordsEntity.java index 7ee8a242..355c45b4 100644 --- a/src/main/java/com/peanut/modules/book/entity/BookMedicalRecordsEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/BookMedicalRecordsEntity.java @@ -1,9 +1,6 @@ package com.peanut.modules.book.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serializable; @@ -44,6 +41,7 @@ public class BookMedicalRecordsEntity implements Serializable { /** * 删除标志 */ + @TableLogic private Integer delFlag; } From 959277de6f3f78e71c2f3b93d2990aeb0fbd1317 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 27 Nov 2023 10:36:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=9B=BE=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookMedicalRecordsController.java | 42 ++++++++++++++++++- .../book/dao/BookMedicalRecordsDao.java | 9 ++++ .../service/BookMedicalRecordsService.java | 4 ++ .../impl/BookMedicalRecordsServiceImpl.java | 8 ++++ .../mapper/book/BookMedicalRecordsDao.xml | 7 ++++ 5 files changed, 69 insertions(+), 1 deletion(-) 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 d5dac974..51bcc103 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -1,11 +1,17 @@ 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.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.Query; import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookEntity; import com.peanut.modules.book.entity.BookMedicalRecordsEntity; +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 lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -22,12 +28,46 @@ public class BookMedicalRecordsController { @Autowired private BookMedicalRecordsService bookMedicalRecordsService; + @Autowired + private BookService bookService; + @Autowired + private UserEbookBuyService userEbookBuyService; + /** + * 已购图书列表 + */ + @RequestMapping("/userEbookBuyList") + public R userEbookBuyList(@RequestBody Map params){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper<>(); + wrapper.selectAll(BookEntity.class); + wrapper.leftJoin(UserEbookBuyEntity.class, UserEbookBuyEntity::getBookId,BookEntity::getId); + wrapper.leftJoin(BookMedicalRecordsEntity.class,BookMedicalRecordsEntity::getBookId,BookEntity::getId); + wrapper.eq(BookMedicalRecordsEntity::getDelFlag,0); + wrapper.eq(BookEntity::getDelFlag,0); + wrapper.eq(BookEntity::getState,1); + wrapper.eq(UserEbookBuyEntity::getUserId,params.get("userId")); + wrapper.groupBy(BookMedicalRecordsEntity::getBookId); + IPage page = bookService.page( + new Query().getPage(params),wrapper); + return R.ok().put("page", page); + } + /** + * 推荐图书列表 + */ + @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); + page.setRecords(list); + return R.ok().put("page", page); + } /** * 列表 */ @RequestMapping("/list") - public R list(@RequestParam Map params){ + public R list(@RequestBody Map params){ IPage page = bookMedicalRecordsService.page( new Query().getPage(params), new QueryWrapper() 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 b44a1cae..75de02a2 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookMedicalRecordsDao.java @@ -1,9 +1,18 @@ package com.peanut.modules.book.dao; import com.github.yulichang.base.MPJBaseMapper; +import com.peanut.modules.book.entity.BookEntity; import com.peanut.modules.book.entity.BookMedicalRecordsEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + @Mapper public interface BookMedicalRecordsDao extends MPJBaseMapper { + + + + List getBooks(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 14626aa4..2cfe3eb1 100644 --- a/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java +++ b/src/main/java/com/peanut/modules/book/service/BookMedicalRecordsService.java @@ -2,6 +2,7 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.common.utils.PageUtils; +import com.peanut.modules.book.entity.BookEntity; import com.peanut.modules.book.entity.BookMedicalRecordsEntity; import java.util.List; @@ -10,4 +11,7 @@ import java.util.Map; public interface BookMedicalRecordsService extends IService { + + List getBooks(Integer userId); + } 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 0bd9a697..77eb7d97 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 @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.Query; import com.peanut.modules.book.dao.BookMedicalRecordsDao; +import com.peanut.modules.book.entity.BookEntity; import com.peanut.modules.book.entity.BookMedicalRecordsEntity; import com.peanut.modules.book.service.BookMedicalRecordsService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -18,5 +20,11 @@ import java.util.Map; @Service public class BookMedicalRecordsServiceImpl extends ServiceImpl implements BookMedicalRecordsService { + @Autowired + private BookMedicalRecordsDao dao; + @Override + public List getBooks(Integer userId) { + return dao.getBooks(userId); + } } diff --git a/src/main/resources/mapper/book/BookMedicalRecordsDao.xml b/src/main/resources/mapper/book/BookMedicalRecordsDao.xml index 806a5504..a99ac9a6 100644 --- a/src/main/resources/mapper/book/BookMedicalRecordsDao.xml +++ b/src/main/resources/mapper/book/BookMedicalRecordsDao.xml @@ -14,5 +14,12 @@ + \ No newline at end of file From a307ce188197aa84f0eeed0ec2f227743218c7ed Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 27 Nov 2023 11:04:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=9B=BE=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/controller/BookMedicalRecordsController.java | 10 ++++++---- .../peanut/modules/book/dao/BookMedicalRecordsDao.java | 2 +- .../book/service/BookMedicalRecordsService.java | 2 +- .../service/impl/BookMedicalRecordsServiceImpl.java | 7 +++++-- .../resources/mapper/book/BookMedicalRecordsDao.xml | 1 + 5 files changed, 14 insertions(+), 8 deletions(-) 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 From 5473b21747c1cd388d5edd1fd0a8654a63531ad4 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 27 Nov 2023 11:06:10 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8C=BB=E6=A1=88=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=9B=BE=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/controller/BookMedicalRecordsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e473400..dd444939 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookMedicalRecordsController.java @@ -62,7 +62,7 @@ public class BookMedicalRecordsController { Page page = new Page<>(); page.setRecords(list); page.setTotal(list.size()); - page.setPages(Math.round(list.size()/page.getSize())); + page.setPages((int)Math.ceil(list.size()/page.getSize())); return R.ok().put("page", page); } /**