From 9589946442db1bd7942a449cb6e3e93b281caaa9 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Thu, 21 Sep 2023 11:41:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- .../ShopProductLabelController.java | 14 ++++++++++ .../controller/UserEbookBuyController.java | 27 ++++++++++++++++++- .../peanut/modules/book/dao/ActivityDao.java | 3 ++- .../peanut/modules/book/dao/AuthorDao.java | 3 ++- .../book/dao/BookBrowseRecordsDao.java | 3 ++- .../modules/book/dao/BookBuyConfigDao.java | 3 ++- .../modules/book/dao/BookCategoryDao.java | 3 ++- .../book/dao/BookChapterContentDao.java | 3 ++- .../modules/book/dao/BookChapterDao.java | 3 ++- .../book/dao/BookClockinCommentDao.java | 3 ++- .../modules/book/dao/BookClockinDao.java | 3 ++- .../modules/book/dao/BookClockinPunchDao.java | 3 ++- .../com/peanut/modules/book/dao/BookDao.java | 3 ++- .../book/dao/BookForumArticlesDao.java | 3 ++- .../modules/book/dao/ShopProductLabelDao.java | 7 ++++- .../book/dao/ShopProductToLabelDao.java | 4 +-- 17 files changed, 73 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 8b9050b3..2ec4a7a7 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ buildNumber.properties # https://github.com/takari/maven-wrapper#usage-without-binary-jar .mvn/wrapper/maven-wrapper.jar /.idea/ -src/main/resources/weChatConfig.properties \ No newline at end of file +src/main/resources/weChatConfig.properties +/src/test/ diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java index 360a0968..4157365b 100644 --- a/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java +++ b/src/main/java/com/peanut/modules/book/controller/ShopProductLabelController.java @@ -2,6 +2,7 @@ package com.peanut.modules.book.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.peanut.common.utils.R; +import com.peanut.modules.book.dao.ShopProductLabelDao; import com.peanut.modules.book.entity.ShopProductLabelEntity; import com.peanut.modules.book.entity.ShopProductToLabelEntity; import com.peanut.modules.book.service.ShopProductLabelService; @@ -25,6 +26,8 @@ public class ShopProductLabelController { @Autowired private ShopProductToLabelService shopProductToLabelService; + @Autowired + private ShopProductLabelDao shopProductLabelDao; @RequestMapping("/addLabel") @@ -78,4 +81,15 @@ public class ShopProductLabelController { return R.ok().put("result",re); } + + @RequestMapping("/mytest") + public R mytest(){ + + shopProductLabelService.getBaseMapper(); + + +// shopProductLabelDao.selectJoinList() + return R.ok(); + } + } diff --git a/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java b/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java index 60a59c27..0c07f901 100644 --- a/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java +++ b/src/main/java/com/peanut/modules/book/controller/UserEbookBuyController.java @@ -1,8 +1,13 @@ package com.peanut.modules.book.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.github.yulichang.base.mapper.MPJJoinMapper; +import com.github.yulichang.toolkit.MPJWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.R; +import com.peanut.modules.book.dao.BookDao; import com.peanut.modules.book.entity.BookEntity; import com.peanut.modules.book.entity.UserEbookBuyEntity; import com.peanut.modules.book.service.BookService; @@ -25,6 +30,8 @@ public class UserEbookBuyController { private UserEbookBuyService userEbookBuyService; @Autowired private BookService bookService; + @Autowired + private BookDao bookDao; /** * 列表 @@ -38,8 +45,26 @@ public class UserEbookBuyController { return R.ok().put("page", page); } + /** - * 列表 + * 获取用户打开书列表 + * @return + */ + @RequestMapping("/getUserClockBookList") + public R getUserClockBookList(@RequestParam("userId") Integer userId){ + MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); + wrapper.selectAll(BookEntity.class); + wrapper.leftJoin(UserEbookBuyEntity.class,UserEbookBuyEntity::getBookId,BookEntity::getId); + wrapper.eq(UserEbookBuyEntity::getUserId,userId); + wrapper.eq(BookEntity::getClockIn,1); + wrapper.eq(BookEntity::getDelFlag,0); + List bookEntities = bookDao.selectJoinList(BookEntity.class, wrapper); + return R.ok().put("books",bookEntities).put("tatol",bookEntities.size()); + } + + + /** + * 获取用户打卡书列表 */ @RequestMapping("/appbooklist") diff --git a/src/main/java/com/peanut/modules/book/dao/ActivityDao.java b/src/main/java/com/peanut/modules/book/dao/ActivityDao.java index 2abec389..5b061d65 100644 --- a/src/main/java/com/peanut/modules/book/dao/ActivityDao.java +++ b/src/main/java/com/peanut/modules/book/dao/ActivityDao.java @@ -1,6 +1,7 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.ActivityEntity; import com.peanut.modules.book.entity.BuyOrderEntity; import org.apache.ibatis.annotations.Mapper; @@ -15,7 +16,7 @@ import java.util.List; * @date 2022-08-29 15:27:44 */ @Mapper -public interface ActivityDao extends BaseMapper { +public interface ActivityDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/AuthorDao.java b/src/main/java/com/peanut/modules/book/dao/AuthorDao.java index bc4dbaa3..1304fb7b 100644 --- a/src/main/java/com/peanut/modules/book/dao/AuthorDao.java +++ b/src/main/java/com/peanut/modules/book/dao/AuthorDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.AuthorEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022-08-04 15:36:59 */ @Mapper -public interface AuthorDao extends BaseMapper { +public interface AuthorDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookBrowseRecordsDao.java b/src/main/java/com/peanut/modules/book/dao/BookBrowseRecordsDao.java index ebd8ef67..f7b23195 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookBrowseRecordsDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookBrowseRecordsDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookBrowseRecordsEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022-08-29 15:27:44 */ @Mapper -public interface BookBrowseRecordsDao extends BaseMapper { +public interface BookBrowseRecordsDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookBuyConfigDao.java b/src/main/java/com/peanut/modules/book/dao/BookBuyConfigDao.java index b6ccbe43..557a5365 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookBuyConfigDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookBuyConfigDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookBuyConfigEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022-10-17 14:54:08 */ @Mapper -public interface BookBuyConfigDao extends BaseMapper { +public interface BookBuyConfigDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java b/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java index 0b1bcf97..d62918f8 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookCategoryDao.java @@ -2,6 +2,7 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookCategoryEntity; import org.apache.ibatis.annotations.Mapper; @@ -11,7 +12,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BookCategoryDao extends BaseMapper { +public interface BookCategoryDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookChapterContentDao.java b/src/main/java/com/peanut/modules/book/dao/BookChapterContentDao.java index 5a4a5fbd..06e91dcb 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookChapterContentDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookChapterContentDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookChapterContentEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022-08-16 14:32:06 */ @Mapper -public interface BookChapterContentDao extends BaseMapper { +public interface BookChapterContentDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookChapterDao.java b/src/main/java/com/peanut/modules/book/dao/BookChapterDao.java index f20e1042..ca29437a 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookChapterDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookChapterDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookChapterEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -12,6 +13,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2022-08-12 09:53:25 */ @Mapper -public interface BookChapterDao extends BaseMapper { +public interface BookChapterDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java index 3bc2ffeb..78b3ec99 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java @@ -2,9 +2,10 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookClockinCommentEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BookClockinCommentDao extends BaseMapper { +public interface BookClockinCommentDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java index 4430ab83..37b678a4 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java @@ -1,11 +1,12 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookClockinEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BookClockinDao extends BaseMapper { +public interface BookClockinDao extends MPJBaseMapper { diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java index 755e9a6b..02a74121 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java @@ -1,11 +1,12 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookClockinPunchEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BookClockinPunchDao extends BaseMapper { +public interface BookClockinPunchDao extends MPJBaseMapper { diff --git a/src/main/java/com/peanut/modules/book/dao/BookDao.java b/src/main/java/com/peanut/modules/book/dao/BookDao.java index 27999b16..467821b0 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookDao.java @@ -1,5 +1,6 @@ package com.peanut.modules.book.dao; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -15,7 +16,7 @@ import java.util.Map; * @date 2022-08-04 15:36:59 */ @Mapper -public interface BookDao extends BaseMapper { +public interface BookDao extends MPJBaseMapper { List queryBookInOther(String publisherName,String authorName); diff --git a/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java b/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java index 9c3aaf8f..eafbe99c 100644 --- a/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java +++ b/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java @@ -1,10 +1,11 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.BookForumArticlesEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface BookForumArticlesDao extends BaseMapper { +public interface BookForumArticlesDao extends MPJBaseMapper { } diff --git a/src/main/java/com/peanut/modules/book/dao/ShopProductLabelDao.java b/src/main/java/com/peanut/modules/book/dao/ShopProductLabelDao.java index e8751352..7027507d 100644 --- a/src/main/java/com/peanut/modules/book/dao/ShopProductLabelDao.java +++ b/src/main/java/com/peanut/modules/book/dao/ShopProductLabelDao.java @@ -1,9 +1,14 @@ package com.peanut.modules.book.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; import com.peanut.modules.book.entity.ShopProductLabelEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface ShopProductLabelDao extends BaseMapper { +public interface ShopProductLabelDao extends MPJBaseMapper { + + + + } diff --git a/src/main/java/com/peanut/modules/book/dao/ShopProductToLabelDao.java b/src/main/java/com/peanut/modules/book/dao/ShopProductToLabelDao.java index 48b4ddde..e087e353 100644 --- a/src/main/java/com/peanut/modules/book/dao/ShopProductToLabelDao.java +++ b/src/main/java/com/peanut/modules/book/dao/ShopProductToLabelDao.java @@ -1,11 +1,9 @@ package com.peanut.modules.book.dao; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; -import com.peanut.modules.book.entity.ShopProductLabelEntity; import com.peanut.modules.book.entity.ShopProductToLabelEntity; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface ShopProductToLabelDao extends BaseMapper { +public interface ShopProductToLabelDao extends MPJBaseMapper { }