From 408782f7aab41fead70d917388ed81d6a5c31e39 Mon Sep 17 00:00:00 2001 From: yc13649764453 <1902434166@qq.com> Date: Sat, 9 Sep 2023 14:01:15 +0800 Subject: [PATCH] =?UTF-8?q?--=E6=96=B0=E7=89=88=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookClockinCommentController.java | 145 ++++++++ .../controller/BookClockinController.java | 350 ++++++++++++++++++ .../BookClockinPunchController.java | 225 +++++++++++ .../BookForumArticlesServiceController.java | 103 ++++++ .../BookForumCommentController.java | 91 +++++ .../controller/BookListeningController.java | 125 +++++++ .../BookListeningShelfController.java | 82 ++++ .../book/controller/BookTaskController.java | 159 ++++++++ .../controller/UserFeedbackController.java | 95 +++++ .../controller/UserFollowUpController.java | 196 ++++++++++ .../book/controller/UserRecordController.java | 236 ++++++++++++ .../book/dao/BookClockinCommentDao.java | 10 + .../modules/book/dao/BookClockinDao.java | 12 + .../modules/book/dao/BookClockinPunchDao.java | 13 + .../book/dao/BookForumArticlesDao.java | 10 + .../modules/book/dao/BookForumCommentDao.java | 10 + .../modules/book/dao/BookListeningDao.java | 11 + .../book/dao/BookListeningShelfDao.java | 9 + .../peanut/modules/book/dao/BookTaskDao.java | 9 + .../modules/book/dao/PayIOSOrderDao.java | 13 + .../modules/book/dao/UserFeedbackDao.java | 9 + .../modules/book/dao/UserFollowUpDao.java | 10 + .../modules/book/dao/UserRecordDao.java | 13 + .../book/entity/BookClockinCommentEntity.java | 74 ++++ .../book/entity/BookClockinEntity.java | 120 ++++++ .../book/entity/BookClockinPunchEntity.java | 55 +++ .../book/entity/BookForumArticlesEntity.java | 71 ++++ .../book/entity/BookForumCommentEntity.java | 63 ++++ .../book/entity/BookListeningEntity.java | 74 ++++ .../book/entity/BookListeningShelfEntity.java | 51 +++ .../modules/book/entity/BookTaskEntity.java | 84 +++++ .../book/entity/UserAppAuthorEntity.java | 22 ++ .../book/entity/UserFeedbackEntity.java | 66 ++++ .../book/entity/UserFollowUpEntity.java | 79 ++++ .../modules/book/entity/UserRecordEntity.java | 75 ++++ .../service/BookClockinCommentService.java | 12 + .../book/service/BookClockinPunchService.java | 15 + .../book/service/BookClockinService.java | 15 + .../service/BookForumArticlesService.java | 13 + .../book/service/BookForumCommenService.java | 11 + .../book/service/BookListeningService.java | 13 + .../service/BookListeningShelfService.java | 12 + .../modules/book/service/BookTaskService.java | 13 + .../book/service/UserFeedbackSerivce.java | 7 + .../book/service/UserFollowUpService.java | 11 + .../book/service/UserRecordService.java | 25 ++ .../impl/BookClockinCommentServiceImpl.java | 30 ++ .../impl/BookClockinPunchServiceImp.java | 34 ++ .../service/impl/BookClockinServiceImpl.java | 45 +++ .../impl/BookForumArticlesServiceImpl.java | 42 +++ .../impl/BookForumCommenServiceImpl.java | 31 ++ .../impl/BookListeningServiceImpl.java | 29 ++ .../impl/BookListeningShelfServiceImpl.java | 26 ++ .../service/impl/BookTaskServiceImpl.java | 42 +++ .../service/impl/UserFeedbackServiceImpl.java | 12 + .../service/impl/UserFollowUpServiceImpl.java | 35 ++ .../service/impl/UserRecordServiceImpl.java | 113 ++++++ .../peanut/modules/book/to/UserRecordDto.java | 23 ++ .../peanut/modules/book/vo/BookOrderVo.java | 62 ++++ .../mapper/book/BookClockinCommentDao.xml | 22 ++ .../resources/mapper/book/BookClockinDao.xml | 31 ++ .../mapper/book/BookClockinPunchDao.xml | 24 ++ .../mapper/book/BookForumArticlesDao.xml | 22 ++ .../mapper/book/BookForumCommentDao.xml | 23 ++ .../mapper/book/BookListeningDao.xml | 22 ++ .../resources/mapper/book/BookTaskDao.xml | 26 ++ .../resources/mapper/book/PayIOSOrderDao.xml | 33 ++ .../resources/mapper/book/UserFeedbackDao.xml | 21 ++ .../resources/mapper/book/UserFollowUpDao.xml | 21 ++ .../resources/mapper/book/UserRecordDao.xml | 20 + 70 files changed, 3706 insertions(+) create mode 100644 src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookClockinController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookForumCommentController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookListeningController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookListeningShelfController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/BookTaskController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/UserFeedbackController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/UserFollowUpController.java create mode 100644 src/main/java/com/peanut/modules/book/controller/UserRecordController.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookClockinDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookForumCommentDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookListeningDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookListeningShelfDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/BookTaskDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/PayIOSOrderDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/UserFeedbackDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/UserFollowUpDao.java create mode 100644 src/main/java/com/peanut/modules/book/dao/UserRecordDao.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookClockinCommentEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookClockinEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookClockinPunchEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookForumArticlesEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookForumCommentEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookListeningEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookListeningShelfEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/BookTaskEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/UserAppAuthorEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/UserFeedbackEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/UserFollowUpEntity.java create mode 100644 src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookClockinCommentService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookClockinPunchService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookClockinService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookForumArticlesService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookForumCommenService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookListeningService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookListeningShelfService.java create mode 100644 src/main/java/com/peanut/modules/book/service/BookTaskService.java create mode 100644 src/main/java/com/peanut/modules/book/service/UserFeedbackSerivce.java create mode 100644 src/main/java/com/peanut/modules/book/service/UserFollowUpService.java create mode 100644 src/main/java/com/peanut/modules/book/service/UserRecordService.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookClockinCommentServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookClockinPunchServiceImp.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookForumArticlesServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookForumCommenServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookListeningServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookListeningShelfServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/UserFeedbackServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/UserFollowUpServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java create mode 100644 src/main/java/com/peanut/modules/book/to/UserRecordDto.java create mode 100644 src/main/java/com/peanut/modules/book/vo/BookOrderVo.java create mode 100644 src/main/resources/mapper/book/BookClockinCommentDao.xml create mode 100644 src/main/resources/mapper/book/BookClockinDao.xml create mode 100644 src/main/resources/mapper/book/BookClockinPunchDao.xml create mode 100644 src/main/resources/mapper/book/BookForumArticlesDao.xml create mode 100644 src/main/resources/mapper/book/BookForumCommentDao.xml create mode 100644 src/main/resources/mapper/book/BookListeningDao.xml create mode 100644 src/main/resources/mapper/book/BookTaskDao.xml create mode 100644 src/main/resources/mapper/book/PayIOSOrderDao.xml create mode 100644 src/main/resources/mapper/book/UserFeedbackDao.xml create mode 100644 src/main/resources/mapper/book/UserFollowUpDao.xml create mode 100644 src/main/resources/mapper/book/UserRecordDao.xml diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java b/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java new file mode 100644 index 00000000..4ae3f6d6 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java @@ -0,0 +1,145 @@ +package com.peanut.modules.book.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookClockinCommentEntity; +import com.peanut.modules.book.entity.BookClockinEntity; +import com.peanut.modules.book.entity.BookClockinPunchEntity; +import com.peanut.modules.book.service.BookClockinCommentService; +import com.peanut.modules.book.service.BookClockinPunchService; +import com.peanut.modules.book.service.BookClockinService; +import com.peanut.modules.book.service.BookTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.Map; + +/** + * 签到信息用户评论 + * + */ + +@RestController +@RequestMapping("clockin/comment") +public class BookClockinCommentController { + + @Autowired + private BookClockinCommentService bookClockinCommentService; + @Autowired + private BookClockinPunchService bookClockinPunchService; + @Autowired + private BookClockinService bookClockinService; + + /** + * 列表 倒叙 + */ + @RequestMapping("/applist") + public R applist(@RequestParam Map params){ + PageUtils page = bookClockinCommentService.queryPage(params); + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id){ + BookClockinCommentEntity commentEntity = bookClockinCommentService.getById(id); + + return R.ok().put("commentEntity", commentEntity); + } + + /** + * 保存 + */ + @RequestMapping("/save") + public R save(@RequestBody BookClockinCommentEntity clockinComment){ + Integer bookid1 = clockinComment.getBookId(); + Integer userId = clockinComment.getUserId(); + Integer taskId = clockinComment.getTaskId(); + + + BookClockinCommentEntity bookClockinCommentEntity = bookClockinCommentService.getBaseMapper().selectOne(new QueryWrapper() + .eq("book_id", bookid1) + .eq("user_id", userId) + .eq("task_id", taskId) + + ); + BookClockinPunchEntity ClockinCommen = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper() + .eq("book_id", bookid1) + .eq("user_id", userId) + .eq("t_id", taskId) + + ); + + + + if (bookClockinCommentEntity !=null) { + return R.error("该信息允许发布一条内容，请勿重复发布"); + } + + if (ClockinCommen!=null) { + clockinComment.setPid(1); + } + + bookClockinCommentService.save(clockinComment); + return R.ok(); + } + + + /** + * 保存 + */ + @RequestMapping("/replysave") + public R replysave(@RequestBody BookClockinCommentEntity clockinComment) { + Integer bookid = clockinComment.getBookId(); + Integer userId = clockinComment.getUserId(); + Integer pid = clockinComment.getPid(); + BookClockinEntity bookClockinEntity = bookClockinService.getBaseMapper().selectOne(new QueryWrapper() + .eq("id",pid) + ); + clockinComment.setDelFlag(0); + bookClockinCommentService.save(clockinComment); + + return R.ok(); + } + + + + + + + + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookClockinCommentEntity clockinComment){ + + bookClockinCommentService.updateById(clockinComment); + return R.ok(); + } + + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids){ + bookClockinCommentService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + + + + + +} + + + + diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockinController.java b/src/main/java/com/peanut/modules/book/controller/BookClockinController.java new file mode 100644 index 00000000..f9e06049 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookClockinController.java @@ -0,0 +1,350 @@ +package com.peanut.modules.book.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.*; +import com.peanut.modules.book.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.*; +/** + * 签到内容信息 + * + */ +@RestController +@RequestMapping("book/clockin") +public class BookClockinController { + @Autowired + private BookClockinService bookClockinService; + @Autowired + private BookTaskService bookTaskService; + @Autowired + private BookClockinCommentService bookClockinCommentService; + @Autowired + private MyUserService myUserService; + @Autowired + private BookService bookService; + @Autowired + private BookClockinPunchService bookClockinPunchService; + /** + * 列表 app post请求 + */ + @RequestMapping("/applistSS") + public R applist(@RequestParam Map params) { + PageUtils page = bookClockinService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 查看全部评价 + */ + @RequestMapping("/applist") + public R applist(@RequestParam("bookid") String bookid, + @RequestParam("taskid") String taskid) { + + List bookClockinEntityList = bookClockinService.getBaseMapper().selectList(new QueryWrapper() + .eq("book_id", bookid).eq("task_id", taskid)); + List list = new ArrayList<>(); + for (BookClockinEntity bookClockinEntity : bookClockinEntityList) { + Map map = new HashMap<>(); + String name = ""; + String avatar=""; + Integer id2 =null; + Integer userId = bookClockinEntity.getUserId(); + Integer taskId = bookClockinEntity.getTaskId(); + Integer bookId = bookClockinEntity.getBookId(); + String conTent = bookClockinEntity.getContent(); + Integer id1 = bookClockinEntity.getId(); + String images = (String)bookClockinEntity.getImages(); + Date createTime = bookClockinEntity.getCreateTime(); + List id = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", userId)); + for (MyUserEntity user : id) { + name = user.getNickname(); + id2 = user.getId(); + avatar = user.getAvatar(); + } + + //评论信息 + map.put("userid", id2); + map.put("name", name); + map.put("avatar", avatar); + map.put("bookid", bookId); + map.put("taskId", taskId); + map.put("content", conTent); + map.put("images", images); + map.put("createdate", createTime); + list.add(map); + } + Collections.reverse(list); + return R.ok().put("list", list); + } + + + + + + /** + * 列表 后台get请求 + */ + @RequestMapping("/list") + public R list(@RequestParam Map params) { + PageUtils page = bookClockinService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id) { + BookClockinEntity bookClockinEntity = bookClockinService.getById(id); + return R.ok().put("bookBuyConfig", bookClockinEntity); + } + + /** + * 保存 + */ + @RequestMapping("/save") + public R save(@RequestBody BookClockinEntity bookClockinEntity) { + + Integer bookId = bookClockinEntity.getBookId(); + Integer userId = bookClockinEntity.getUserId(); + Integer taskId = bookClockinEntity.getTaskId(); + Integer dayId = bookClockinEntity.getDayId(); + BookClockinPunchEntity bookClockinPunchEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper() + .eq("book_id", bookId) + .eq("t_id", taskId) + .eq("days", dayId) + .eq("user_id", userId) + ); + if (bookClockinPunchEntity==null) { + return R.error("您尚未签到，签到完成即可发表内容"); + } + BookClockinEntity bookClockin = bookClockinService.getBaseMapper().selectOne(new QueryWrapper() + .eq("book_id", bookId) + .eq("task_id", taskId) + .eq("day_id", dayId) + .eq("user_id", userId) + ); + if (bookClockin!=null) { + return R.error("您已参与第"+dayId+"天签到评论"); + } + List> imageList = (ArrayList>) bookClockinEntity.getImageeStrings(); + String imageStr = ""; + for (Map m : imageList) { + imageStr += m.get("url") + ","; + + } + + if (imageStr!=null &&!imageStr.isEmpty()){ + String substring = imageStr.substring(0, imageStr.length() - 1); + bookClockinEntity.setImages(substring); + }else { + bookClockinEntity.setImages(""); + } + + + + bookClockinEntity.setDelFlag(0); + bookClockinService.save(bookClockinEntity); + return R.ok(); + } + + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookClockinEntity bookClockinEntity) { + bookClockinService.updateById(bookClockinEntity); + return R.ok("提交成功"); + } + + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids) { + bookClockinService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + + + /** + * 全部评价 + * + * @param bookId + * @return + */ + @RequestMapping("commentAll") + public R commentAll(@RequestParam("bookId") Integer bookId) { + List applist = new ArrayList<>(); + Map productMap = new HashMap<>(); + //根据bookid查找出签到表中签到的用户数据 + List bookid = bookClockinService.getBaseMapper().selectList(new QueryWrapper() + .eq("book_id", bookId) + .orderByDesc("create_time")); + + for (BookClockinEntity book : bookid) { + HashMap map = new HashMap<>(); + + Integer bookid1 = book.getBookId(); + //BookClockinEntity获取点赞总数 + String likes = book.getLikeSum(); + + Integer userid1 = book.getUserId(); + Integer taskId = book.getTaskId(); + Integer id1 = book.getId(); + applist.add(taskId); + //根据id和bookid查询出对应的签到下评论的全部数据 + + productMap.put("bookid",bookid1); + productMap.put("userid",userid1); + } + PageUtils pages = bookClockinService.queryPage(productMap); + return R.ok().put("days",applist).put("pages",pages); + } + + + /** + * 我的 ：我的签到记录 + * @param id + * @param bookId + * @return + */ + @RequestMapping("/myinfo") + public R myinfo(@RequestParam("userid") Integer id, + @RequestParam("bookid") Integer bookId) { + + + List bookClockinEntityList = bookClockinService.getBaseMapper().selectList(new QueryWrapper() + .eq("user_id",id) .eq("book_id",bookId).orderByDesc("create_time")); + List list = new ArrayList<>(); + + for (BookClockinEntity bookClockinEntity : bookClockinEntityList) { + Map productMap = new HashMap<>(); + Integer userId = bookClockinEntity.getUserId(); + Integer dayId = bookClockinEntity.getDayId(); + Integer bookIds = bookClockinEntity.getBookId(); + Integer typeId = bookClockinEntity.getTaskId(); + String content = bookClockinEntity.getContent(); + Object images = bookClockinEntity.getImages(); + Date createTime = bookClockinEntity.getCreateTime(); + BookEntity byId = bookService.getById(bookId); + String name = byId.getName(); + String images1 = byId.getImages(); + BookTaskEntity bookTaskEntity = bookTaskService.getById(typeId); + String heading = bookTaskEntity.getHeading(); + + + String myUsername = ""; + String avatar=""; + List myUserid = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", userId)); + for (MyUserEntity user : myUserid) { + myUsername = user.getNickname(); + avatar = user.getAvatar(); + } + + productMap.put("myUseravatar",avatar); + productMap.put("myUsername",myUsername); + + productMap.put("dayId",dayId); + productMap.put("userId",userId); + productMap.put("taskId",typeId); + productMap.put("content",content); + productMap.put("clockinimages",images); + productMap.put("createTime",createTime); + productMap.put("bookId",bookIds); + productMap.put("bookname",name); + productMap.put("bookimages",images1); + productMap.put("TaskHeading",heading); + list.add(productMap); + + } +// Collections.sort(list); +// Collections.reverse(list); + return R.ok().put("ClockinList", list); + } + + + /** + * 详情页我的签到评论 + * @param id + * @param taskid + * @param bookId + * @return + */ + @RequestMapping("/myinfolist") + public R myinfolist(@RequestParam("userid") Integer id, + @RequestParam("taskid") Integer taskid, + @RequestParam("bookid") Integer bookId + ) { + List list = new ArrayList<>(); + Map productMap = new HashMap<>(); + BookClockinEntity bookClockin = bookClockinService.getBaseMapper().selectOne(new QueryWrapper() + .eq("user_id",id) + .eq("task_id",taskid) + .eq("book_id",bookId) + ); + BookClockinPunchEntity bookClockinPunchEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper() + .eq("user_id",id) + .eq("t_id",taskid) + .eq("book_id",bookId) + ); + + + if (bookClockin == null ) { + return R.ok(); + } + + Integer userId = bookClockin.getUserId(); + Integer bookIds = bookClockin.getBookId(); + Integer taskId = bookClockin.getTaskId(); + Integer dayId = bookClockin.getDayId(); + String content = bookClockin.getContent(); + Object images = bookClockin.getImages(); + Date createTime = bookClockin.getCreateTime(); + BookEntity byId = bookService.getById(bookId); + String name = byId.getName(); + String images1 = byId.getImages(); + BookTaskEntity bookTaskEntity = bookTaskService.getById(taskId); + String heading = bookTaskEntity.getHeading(); + + + + String myUsername = ""; + String avatar=""; + List myUserid = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", userId)); + for (MyUserEntity user : myUserid) { + myUsername = user.getNickname(); + avatar = user.getAvatar(); + } + + productMap.put("myUseravatar",avatar); + productMap.put("myUsername",myUsername); + + + + productMap.put("userId",userId); + productMap.put("taskId",taskId); + productMap.put("dayId",dayId); + + productMap.put("content",content); + productMap.put("clockinimages",images); + productMap.put("createTime",createTime); + productMap.put("bookId",bookIds); + productMap.put("bookname",name); + productMap.put("bookimages",images1); + productMap.put("TaskHeading",heading); + list.add(productMap); + + Collections.reverse(list); + return R.ok().put("productlist", list); + } + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java b/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java new file mode 100644 index 00000000..fc643caa --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookClockinPunchController.java @@ -0,0 +1,225 @@ +package com.peanut.modules.book.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookClockinCommentEntity; +import com.peanut.modules.book.entity.BookClockinPunchEntity; +import com.peanut.modules.book.entity.BookEntity; +import com.peanut.modules.book.entity.MyUserEntity; +import com.peanut.modules.book.service.BookClockinCommentService; +import com.peanut.modules.book.service.BookClockinPunchService; +import com.peanut.modules.book.service.BookService; +import com.peanut.modules.book.service.MyUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.*; + +@RestController +@RequestMapping("book/clockinPunch") +public class BookClockinPunchController { +@Autowired +private BookClockinPunchService bookClockinPunchService; +@Autowired +private BookService bookService; +@Autowired +private MyUserService myUserService; +@Autowired +private BookClockinCommentService bookClockinCommentService; + + + + + /** + * 列表 app post请求 /applistSS + */ + @RequestMapping("/applist") + public R applist(@RequestParam Map params) { + PageUtils page = bookClockinPunchService.queryPage(params); + + return R.ok().put("page", page); + } + + + + + /** + * 计算打卡天数 + */ + @RequestMapping("/clockindays") + public R applists(@RequestParam("bookId") String bookid, + @RequestParam("userId") String userid) { + ArrayList list = new ArrayList<>(); + + //查询用户id图书id 根据第一天打卡天数开始计算 + BookClockinPunchEntity bookClockinEntity = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper() + .eq("book_id", bookid) + .eq("user_id", userid) + .eq("days",1) + + ); + List bookClockinEntityList = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper() + .eq("book_id", bookid) + .eq("user_id", userid) + + ); + for (BookClockinPunchEntity bookClock : bookClockinEntityList) { + Integer days = bookClock.getDays(); + + list.add(days); + } + + if (bookClockinEntity != null) { + Date createTime = bookClockinEntity.getCreateTime(); + long createTimeMillis = createTime.getTime(); + //获取第一次打卡天数createTimeMillis毫秒数，时间戳减并除以毫秒数（24 * 60 * 60 * 1000）计算打卡总天数+1 + int daysBetween = (int) (System.currentTimeMillis() - createTimeMillis) / (24 * 60 * 60 * 1000)+1; + return R.ok().put("daysBetween", daysBetween).put("dayslist", list); + + } else if (bookClockinEntity == null) { + Date createTime = new Date(); + long createTimeMillis = createTime.getTime(); + //获取第一次打卡天数createTimeMillis毫秒数，时间戳减并除以毫秒数（24 * 60 * 60 * 1000）计算打卡总天数+1 + int daysBetween = (int) (System.currentTimeMillis() - createTimeMillis) / (24 * 60 * 60 * 1000)+1; + return R.ok().put("daysBetween", daysBetween).put("dayslist",list ); + + + + } + + + + return R.error("无信息记录"); + } + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id) { + BookClockinPunchEntity bookClockinPunchEntity = bookClockinPunchService.getById(id); + + return R.ok().put("bookClockinPunchEntity", bookClockinPunchEntity); + } + + /** + * 保存 + */ + @RequestMapping("/save") + //请求接口时是从task的info或者list中发出的，理论上 + public R save(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) { + Integer bookid1 = bookClockinPunchEntity.getBookId(); + Integer userId = bookClockinPunchEntity.getUserId(); + Integer taskId = bookClockinPunchEntity.getTId(); + BookEntity bookEntity = bookService.getBaseMapper().selectById(bookid1); + Boolean canListen = bookEntity.getCanListen(); + BookClockinPunchEntity bookClock = bookClockinPunchService.getBaseMapper().selectOne(new QueryWrapper() + .eq("book_id", bookid1) + .eq("user_id", userId) + .eq("t_id", taskId) + + + + ); + if (bookClock !=null) { + return R.error("您已经签到，请勿重复签到"); + } + + + if(canListen == true){ + boolean b = myUserService.bookAuthenticate(bookid1,userId); + if (b){ + bookClockinPunchEntity.setDelFlag(0); + bookClockinPunchService.save(bookClockinPunchEntity); + return R.ok("签到成功"); + } + + }else { + return R.error("购买此书即可参与签到"); + } + + return R.ok("跳方法001"); + } + + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) { + bookClockinPunchService.updateById(bookClockinPunchEntity); + return R.ok("提交成功"); + } + + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids) { + bookClockinPunchService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + + + /** + * 获取评论 + * @param bookClockinPunchEntity + * @return + */ + @RequestMapping("/punchcoments") + public R punchcoments(@RequestBody BookClockinPunchEntity bookClockinPunchEntity) { + //图书Id + Integer bookId = bookClockinPunchEntity.getBookId(); + //用户id + Integer userId = bookClockinPunchEntity.getUserId(); + //天数 + Integer days = bookClockinPunchEntity.getDays(); + + ArrayList list = new ArrayList<>(); + List bookClockinCommentEntities = bookClockinCommentService.getBaseMapper().selectList(new QueryWrapper() + .eq("user_id", userId) + .eq("book_id", bookId) + .eq("task_id", days) + //pid等于1时为一级评论 +// .eq("pid",1) + ); + for (BookClockinCommentEntity bookClockinCommentEntity : bookClockinCommentEntities) { + HashMap map = new HashMap<>(); + String name = ""; + String avatar=""; + + Integer userId1 = bookClockinCommentEntity.getUserId(); + Integer bookId1 = bookClockinCommentEntity.getBookId(); + String content = bookClockinCommentEntity.getContent(); + String images = bookClockinCommentEntity.getImages(); + Date createTime = bookClockinCommentEntity.getCreateTime(); + + + + List id = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", userId)); + for (MyUserEntity user : id) { + name = user.getNickname(); + avatar = user.getAvatar(); + } + map.put("userid", userId1); + map.put("name", name); + map.put("avatar", avatar); + map.put("bookid", bookId1); + map.put("content", content); + map.put("images", images); + map.put("createdate", createTime); + list.add(map); + + } + + Collections.reverse(list); + return R.ok().put("list", list); + + + } + + + + } + diff --git a/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java b/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java new file mode 100644 index 00000000..5f24b395 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookForumArticlesServiceController.java @@ -0,0 +1,103 @@ +package com.peanut.modules.book.controller; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookForumArticlesEntity; +import com.peanut.modules.book.entity.BookForumCommentEntity; +import com.peanut.modules.book.service.BookForumArticlesService; +import com.peanut.modules.book.service.BookForumCommenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.Date; +import java.util.Map; + +@RestController +@RequestMapping("forum/articles") +public class BookForumArticlesServiceController { + @Autowired + private BookForumArticlesService bookForumArticlesService; + @Autowired + private BookForumCommenService bookForumCommenService; + + /** + * 列表 (开始时间倒叙) 后台get请求 + */ + @RequestMapping("/desccreatelist") + public R Desccreatelist(@RequestParam Map params){ + PageUtils page = bookForumArticlesService.queryPage(params); + return R.ok().put("page", page); + } + + + /** + * 列表 (修改时间倒叙) app页面 + */ + @RequestMapping("/descupdatelist") + public R Descupdatelist(@RequestParam Map params){ + PageUtils page = bookForumArticlesService.queryPages(params); + return R.ok().put("page", page); + } + + + + + + + /** + * 后台信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id){ + BookForumArticlesEntity forumArticles = bookForumArticlesService.getById(id); + return R.ok().put("BookForumArticlesEntity", forumArticles); + } + + + + + /** + * app信息 + */ + @RequestMapping("/appinfo/{id}") + public R appinfo(@PathVariable("id") Integer id){ + BookForumArticlesEntity forumArticles = bookForumArticlesService.getById(id); + return R.ok().put("BookForumArticlesEntity", forumArticles); + } + + + + + /** + * 保存 + */ + @RequestMapping("/save") + + public R save(@RequestBody BookForumArticlesEntity bookForumArticlesEntity){ + bookForumArticlesEntity.setCreateTime(new Date()); + bookForumArticlesEntity.setDelflag(0); + bookForumArticlesService.saveOrUpdate(bookForumArticlesEntity); + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookForumArticlesEntity bookForumArticlesEntity){ + bookForumArticlesEntity.setUpdateTime(new Date()); + bookForumArticlesService.updateById(bookForumArticlesEntity); + return R.ok(); + } + + + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids){ + bookForumArticlesService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } +} diff --git a/src/main/java/com/peanut/modules/book/controller/BookForumCommentController.java b/src/main/java/com/peanut/modules/book/controller/BookForumCommentController.java new file mode 100644 index 00000000..990c9936 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookForumCommentController.java @@ -0,0 +1,91 @@ +package com.peanut.modules.book.controller; + +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookForumCommentEntity; +import com.peanut.modules.book.service.BookForumArticlesService; +import com.peanut.modules.book.service.BookForumCommenService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Map; + + +/** + * 评价文章 + * + */ +@RestController +@RequestMapping("forum/comment") +public class BookForumCommentController { + + @Autowired + private BookForumCommenService bookForumCommentService; + @Autowired + private BookForumArticlesService bookForumArticlesService; + + /** + * 列表 + */ + @RequestMapping("/list") + public R list(@RequestParam Map params){ + PageUtils page = bookForumCommentService.queryPage(params); + return R.ok().put("page", page); + } + + + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id){ + BookForumCommentEntity forumCom = bookForumCommentService.getById(id); + + return R.ok().put("BookForumCommentEntity", forumCom); + } + + + /** + * 保存 + */ + @RequestMapping("/save") + + public R save(@RequestBody BookForumCommentEntity bookForumCommentEntity){ + bookForumCommentEntity.setDelflag(0); + bookForumCommentService.saveOrUpdate(bookForumCommentEntity); + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookForumCommentEntity bookForumCommentEntity){ + bookForumCommentService.updateById(bookForumCommentEntity); + + return R.ok(); + } + + + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids){ + bookForumCommentService.removeByIds(Arrays.asList(ids)); + return R.ok(); + } + + + + + + + + +} diff --git a/src/main/java/com/peanut/modules/book/controller/BookListeningController.java b/src/main/java/com/peanut/modules/book/controller/BookListeningController.java new file mode 100644 index 00000000..97fd290c --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookListeningController.java @@ -0,0 +1,125 @@ +package com.peanut.modules.book.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookListeningEntity; +import com.peanut.modules.book.service.BookListeningService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.Map; + +/** + * 听书进度表 + * + */ +@RestController +@RequestMapping("book/listening") +public class BookListeningController { + + @Autowired + private BookListeningService bookListeningService; + + /** + * 列表 + */ + @RequestMapping("/list") + public R list(@RequestParam Map params){ + PageUtils page = bookListeningService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id){ + BookListeningEntity bookReadRate = bookListeningService.getById(id); + + return R.ok().put("bookReadRate", bookReadRate); + } + + /** + * 保存 + */ + @RequestMapping("/save") + public R save( BookListeningEntity booklistening){ + Integer bookId = booklistening.getBookId(); + Integer userId = booklistening.getUserId(); + BookListeningEntity booklisteningEntity = bookListeningService.getBaseMapper().selectOne(new QueryWrapper().eq("book_id", bookId) + .eq("user_id", userId)); + if (booklisteningEntity != null) { + BookListeningEntity one = bookListeningService.getOne(new QueryWrapper() + .eq("book_id", booklistening.getBookId()) + .eq("user_id", booklistening.getUserId())); + Integer id = one.getId(); + // 构建新的BookListeningEntity对象，设置需要修改的字段 + BookListeningEntity updatedEntity = new BookListeningEntity(); + updatedEntity.setId(id); + updatedEntity.setPrecent(booklistening.getPrecent()); + updatedEntity.setChapterId(booklistening.getChapterId()); + updatedEntity.setChapterName(booklistening.getChapterName()); + updatedEntity.setUpdateTime(new Date()); + // 执行更新操作 + bookListeningService.updateById(updatedEntity); + return R.ok().put("bookListeningId",booklisteningEntity.getId()); + }else { + + bookListeningService.save(booklistening); + } + + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookListeningEntity booklistening) { + BookListeningEntity one = bookListeningService.getOne(new QueryWrapper() + .eq("book_id", booklistening.getBookId()) + .eq("user_id", booklistening.getUserId())); + if (one != null) { + Integer id = one.getId(); + + // 构建新的BookListeningEntity对象，设置需要修改的字段 + BookListeningEntity updatedEntity = new BookListeningEntity(); + updatedEntity.setId(id); + updatedEntity.setPrecent(booklistening.getPrecent()); + updatedEntity.setChapterId(booklistening.getChapterId()); + updatedEntity.setChapterName(booklistening.getChapterName()); + updatedEntity.setUpdateTime(new Date()); + + // 执行更新操作 + bookListeningService.updateById(updatedEntity); + + + } + return R.ok(); + } + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids){ + bookListeningService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + + /** + * 获取阅读进度 + */ + @RequestMapping("/getReadRate") + public R getReadRate(@RequestBody BookListeningEntity booklistening){ + BookListeningEntity one = bookListeningService.getOne(new QueryWrapper().eq("user_id", booklistening.getUserId()).eq("book_id", booklistening.getBookId())); + return R.ok().put("readRate",one); + } + + +} diff --git a/src/main/java/com/peanut/modules/book/controller/BookListeningShelfController.java b/src/main/java/com/peanut/modules/book/controller/BookListeningShelfController.java new file mode 100644 index 00000000..a5b5648d --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookListeningShelfController.java @@ -0,0 +1,82 @@ +package com.peanut.modules.book.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookBrowseRecordsEntity; +import com.peanut.modules.book.entity.BookListeningEntity; +import com.peanut.modules.book.entity.BookListeningShelfEntity; +import com.peanut.modules.book.entity.BookShelfEntity; +import com.peanut.modules.book.service.BookBrowseRecordsService; +import com.peanut.modules.book.service.BookListeningService; +import com.peanut.modules.book.service.BookListeningShelfService; +import com.peanut.modules.book.service.BookShelfService; +import com.peanut.modules.book.vo.BookShelfVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("book/BookListeningShelf") +public class BookListeningShelfController { + @Autowired + private BookListeningShelfService bookListeningShelfService; + @Autowired + private BookBrowseRecordsService bookBrowseRecordsService; + + /** + * 列表 + */ + @RequestMapping("/list") + + public R list(@RequestParam Map params){ + PageUtils page = bookListeningShelfService.queryPage(params); + + return R.ok().put("page", page); + } + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + + public R info(@PathVariable("id") Integer id){ + BookListeningShelfEntity bookShelf = bookListeningShelfService.getById(id); + + return R.ok().put("bookShelf", bookShelf); + } + + + + /** + * 删除 + */ + @RequestMapping("/delete") +// @RequiresPermissions("book:bookshelf:delete") + public R delete(@RequestBody Integer[] ids){ + bookBrowseRecordsService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + + + + + + /** + * 获取用户听书书架 getUserBookChapterRead + */ +// @RequestMapping("/getUserBookChapterRead") +// public R getUserBookChapterRead(@RequestParam Integer userId){ +// List bookShelfVos = bookBrowseRecordsService.getUserBookChapterRead(userId); +// +// return R.ok().put("bookShelfVos",bookShelfVos); +// } + + +} diff --git a/src/main/java/com/peanut/modules/book/controller/BookTaskController.java b/src/main/java/com/peanut/modules/book/controller/BookTaskController.java new file mode 100644 index 00000000..60a6ae75 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/BookTaskController.java @@ -0,0 +1,159 @@ +package com.peanut.modules.book.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.BookClockinEntity; +import com.peanut.modules.book.entity.BookClockinPunchEntity; +import com.peanut.modules.book.entity.BookTaskEntity; +import com.peanut.modules.book.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + + +/** + * 发布签到任务 + */ +@RestController +@RequestMapping("book/task") +public class BookTaskController { + + @Autowired + private BookTaskService bookTaskService; + @Autowired + private BookService bookService; + @Autowired + private BookClockinService bookClockinService; + @Autowired + private MyUserService myUserService; + @Autowired + private BookClockinPunchService bookClockinPunchService; + + /** + * 列表后台 + * + */ + @RequestMapping("/list") + public R list(@RequestParam Map params) { + PageUtils page = bookTaskService.queryPage(params); + + + return R.ok().put("page", page); + } + + + /** + * 列表app根据days查询 + * + */ + @RequestMapping("/applist") + public R applist(@RequestParam Map params) { + PageUtils page = bookTaskService.queryPageServi(params); + + + return R.ok().put("page", page); + } + + + + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id) { + + //根据id找到详细数据信息 + BookTaskEntity bookTaskEntity = bookTaskService.getById(id); + Integer ids = bookTaskEntity.getId(); + Integer bookid = bookTaskEntity.getBookid(); + List bookClockinPunchEntity = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper() + .eq("user_id", ids) + .eq("book_id", bookid)); + + // 遍历 bookClockinEntityList 中的每个 bookClockinEntity，查询 BookClockinEntity 表中对应的总数 + int total = 0; + for ( BookClockinPunchEntity bookClockin : bookClockinPunchEntity) { + + Integer id1 = bookClockin.getId(); +// BookClockinEntity byId = bookClockinService.getById(id1); + //++获取到总条数 + total ++; + } + //返回总条数 + + return R.ok().put("bookTaskEntity", bookTaskEntity).put("totalCont",total); + } + + /** + * 保存 + */ + @RequestMapping("/save") + public R save(@RequestBody BookTaskEntity bookTaskEntity) { + + bookTaskEntity.setDelFlag(0); + bookTaskService.save(bookTaskEntity); + return R.ok(); + } + + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody BookTaskEntity bookTaskEntity) { + + bookTaskService.updateById(bookTaskEntity); + return R.ok(); + } + + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids) { + bookTaskService.removeByIds(Arrays.asList(ids)); + + return R.ok(); + } + + + + /** + * 总条数 + */ + @RequestMapping("/totalsum") + public R totalsum(@RequestBody BookTaskEntity bookTaskEntity) { + + // 获取 BookTaskEntity 表中所有的 bookid和id + String days = bookTaskEntity.getDays(); + Integer bookid = bookTaskEntity.getBookid(); + List books = bookClockinPunchService.getBaseMapper().selectList(new QueryWrapper() + .eq("days", days) + .eq("book_id", bookid)); + + + + // 遍历 bookClockinEntityList 中的每个 bookClockinEntity，查询 BookClockinEntity 表中对应的总数 + int total = 0; + for ( BookClockinPunchEntity book : books) { + // 使用 bookClockinEntity 进行匹配查询 + Integer id1 = book.getId(); + BookClockinPunchEntity byId = bookClockinPunchService.getById(id1); + //++获取到总条数 + total ++; + } + //返回总条数 + return R.ok().put("totalSum",total); + + } + + + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/book/controller/UserFeedbackController.java b/src/main/java/com/peanut/modules/book/controller/UserFeedbackController.java new file mode 100644 index 00000000..c959cbac --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/UserFeedbackController.java @@ -0,0 +1,95 @@ +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.entity.MyUserEntity; +import com.peanut.modules.book.entity.UserFeedbackEntity; +import com.peanut.modules.book.entity.UserRecordEntity; +import com.peanut.modules.book.service.MyUserService; +import com.peanut.modules.book.service.UserFeedbackSerivce; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +/** + * 追加评论后游客评论无限制 + */ +@RestController +@RequestMapping("/user/feedback") +public class UserFeedbackController { + + + @Autowired + private UserFeedbackSerivce userFeedbackService; + @Autowired + private MyUserService myUserService; + + /** + * 查看我的评价 + */ + @RequestMapping("/Allevaluations") + public R Allevaluations(@RequestBody UserFeedbackEntity userFeedbackEntity){ + List userid = userFeedbackService.getBaseMapper().selectList(new QueryWrapper().eq("userid", userFeedbackEntity.getUserId() + )); + return R.ok().put("Allevaluations",userid); + } + + + + /** + * 查看全部评价 + */ + @RequestMapping("/All") + public R All(@RequestBody UserFeedbackEntity userFeedbackEntity){ + HashMap maps = new HashMap<>(); + List list = new ArrayList<>(); + List bookid = userFeedbackService.getBaseMapper().selectList(new QueryWrapper().eq("bookid", userFeedbackEntity.getBookid())); + for (UserFeedbackEntity userFe : bookid) { + HashMap map = new HashMap<>(); + Integer book = userFe.getBookid(); + Integer use = userFe.getUserId(); + List id = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", use)); + String usser=""; + String name = ""; + for (MyUserEntity user : id) { + usser = user.getAvatar(); + name =user.getNickname(); + + } + map.put("Avatar",usser); + map.put("name",name); + map.put("bookid",book); + map.put("orderSn",userFeedbackEntity.getOrdersn()); + map.put("userid",use); + map.put("content",userFeedbackEntity.getContent()); + map.put("create_date",userFeedbackEntity.getCreate_date()); + map.put("rid",userFeedbackEntity.getRid()); + map.put("fuid",userFeedbackEntity.getFuid()); + list.add(map); + + + + + } + maps.put("list",list); + + return R.ok().put("list",list); + + } + + /** + * 游客评价 + */ + @RequestMapping("/userbacksave") + public R userbacksave(@RequestBody UserFeedbackEntity userFeedbackEntity ) { + + + return R.ok(); + } + +} diff --git a/src/main/java/com/peanut/modules/book/controller/UserFollowUpController.java b/src/main/java/com/peanut/modules/book/controller/UserFollowUpController.java new file mode 100644 index 00000000..1e77f8b5 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/UserFollowUpController.java @@ -0,0 +1,196 @@ +package com.peanut.modules.book.controller; + +import cn.com.marsoft.tool.ToolObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.*; +import com.peanut.modules.book.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +import static com.peanut.common.utils.R.error; + +@RestController +@RequestMapping("/user/followUp") +public class UserFollowUpController { + + + @Autowired + private UserFollowUpService userFollowUpService; + @Autowired + private UserRecordService userRecordService; + @Autowired + private MyUserService myUserService; + @Autowired + private BuyOrderService buyOrderService; + @Autowired + private BuyOrderDetailService buyOrderDetailService; + + + + /** + * 列表 + */ + @RequestMapping("/list") + public R list(@RequestParam Map params ){ + PageUtils page = userFollowUpService.queryPage(params); + return R.ok().put("page", page); + + } + + + + /** + * 我的评价 + */ + @RequestMapping("/Allevaluations") + public R Allevaluations(@RequestBody UserFollowUpEntity userFollowUpEntity){ + List userid = userFollowUpService.getBaseMapper().selectList(new QueryWrapper().eq("userid", userFollowUpEntity.getUserId())); + return R.ok().put("Allevaluations",userid); + } + + + + + + /** + * 全部评价 + */ + @RequestMapping("/Alllevas") + public R Alllevas(@RequestBody UserFollowUpEntity users){ + HashMap maps = new HashMap<>(); + List list = new ArrayList<>(); + List bookid = userFollowUpService.getBaseMapper().selectList(new QueryWrapper().eq("bookid", users.getBookid())); + for (UserFollowUpEntity userRecord : bookid) { + HashMap map = new HashMap<>(); + Integer bookid1 = userRecord.getBookid(); + Integer userid1 = userRecord.getUserId(); + List id = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", userid1)); + String usser=""; + String name = ""; + for (MyUserEntity user : id) { + usser = user.getAvatar(); + name =user.getNickname(); + + } + map.put("Avatar",usser); + map.put("name",name); + map.put("userId", users.getUserId()); + map.put("bookid",bookid1); + map.put("userid",userid1); + map.put("content",users.getConTent()); + map.put("create_date",users.getCreateDate()); + map.put("oid",users.getOid()); + map.put("praIse",users.getPraIse()); + + list.add(map); + + + + + } + maps.put("list",list); + + return R.ok().put("list",list); + + } + + + + /* + * 追加评论(用户只可评论一次) + * + * */ + @RequestMapping("/userFollowUp") + public Object UserFollowUp(@RequestBody UserFollowUpEntity userFollowUpEntity ) { + + + //根据传过来的userid和oid查询出来userRecordEntity中关联数据 + UserRecordEntity userRecord = userRecordService.getBaseMapper().selectOne(new QueryWrapper() + .eq("userid", userFollowUpEntity.getUserId()).last("LIMIT 1") + .eq("bookid", userFollowUpEntity.getBookid()) + .eq("id",userFollowUpEntity.getOid()) + ); + if (userRecord==null){ + return R.error("请先评论再追评"); + } + String orderSn = userRecord.getOrderSn(); + BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper() + .eq("order_sn",orderSn).last("LIMIT 1") + ); + + Integer orderId = buyOrderEntity.getOrderId(); + Integer bookid = userRecord.getBookid(); + Integer userid = userRecord.getUserid(); + Integer id1 = userRecord.getId(); + BuyOrderDetailEntity detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper() + .eq("Order_id", orderId).eq("product_id",bookid)); + + UserFollowUpEntity followUpEntity = userFollowUpService.getBaseMapper().selectOne(new QueryWrapper().eq("userid", userid).eq("oid",id1).last("LIMIT 1")); + +// if (followUpEntity != null) { +// return R.error("您已评价过"); +// } + + buyOrderEntity.setRecordId(2); + buyOrderService.saveOrUpdate(buyOrderEntity); + if (userFollowUpEntity.getImages()!=null) { + + List> imageList = (ArrayList>)userFollowUpEntity.getImages(); + String imageStr = ""; + for(Map m : imageList){ + imageStr += m.get("url") + ","; + } + + userFollowUpEntity.setImages(imageStr); + + } + + userFollowUpEntity.setOid(id1); + userFollowUpEntity.setDelflag(0); + userFollowUpEntity.setCreateDate(new Date()); + userFollowUpService.saveOrUpdate(userFollowUpEntity); + return R.ok("成功").put("userFollowUpEntity",userFollowUpEntity); + } + + + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id){ + UserFollowUpEntity user = userFollowUpService.getById(id); + + return R.ok().put("UserFollowUpEntity", user); + } + + + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody UserRecordEntity user){ + userRecordService.updateById(user); + + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids){ + userRecordService.removeByIds(Arrays.asList(ids)); + + + return R.ok(); + } + + + } diff --git a/src/main/java/com/peanut/modules/book/controller/UserRecordController.java b/src/main/java/com/peanut/modules/book/controller/UserRecordController.java new file mode 100644 index 00000000..374a2567 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/controller/UserRecordController.java @@ -0,0 +1,236 @@ +package com.peanut.modules.book.controller; +import cn.com.marsoft.tool.ToolObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.gson.Gson; +import com.peanut.common.utils.PageUtils; +import com.peanut.common.utils.R; +import com.peanut.modules.book.entity.*; +import com.peanut.modules.book.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.*; +import java.util.stream.Collectors; + +import static com.peanut.common.utils.R.error; +@RestController +@RequestMapping("buy/record") +public class UserRecordController { + @Autowired + private UserRecordService userRecordService; + @Autowired + private BuyOrderService buyOrderService; + @Autowired + private MyUserService myUserService; + @Autowired + private BuyOrderDetailService buyOrderDetailService; + @Autowired + private UserFollowUpService userFollowUpService; + + + /** + * 列表 + */ + @RequestMapping("/list") + public R list(@RequestParam Map params ){ + PageUtils page = userRecordService.queryPage(params); + return R.ok().put("page", page); + + } + + /** + * 查看我的评价 + */ + @RequestMapping("/Allevaluations") + public R Allevaluations(@RequestBody UserRecordEntity userRecordEntity){ + List userid = userRecordService.getBaseMapper().selectList(new QueryWrapper().eq("userid", userRecordEntity.getUserid()).orderByDesc("create_date")); + return R.ok().put("Allevaluations",userid); + } + + /** + * 查看全部评价 + */ + @RequestMapping("/All") + public R All(@RequestBody UserRecordEntity userRecordEntity) { + + List list = new ArrayList<>(); + List bookid = userRecordService.getBaseMapper().selectList(new QueryWrapper().eq("bookid", userRecordEntity.getBookid()).orderByDesc("create_date")); + for (UserRecordEntity userRecord : bookid) { + HashMap map = new HashMap<>(); + Integer bookid1 = userRecord.getBookid(); + Integer userid1 = userRecord.getUserid(); + Integer id1 = userRecord.getId(); + List id = myUserService.getBaseMapper().selectList(new QueryWrapper().eq("id", userid1)); + String usser = ""; + String name = ""; + for (MyUserEntity user : id) { + usser = user.getAvatar(); + name = user.getNickname(); + } + + List followUpEntity = userFollowUpService.getBaseMapper().selectList(new QueryWrapper() + .eq("oid", id1) + .eq("userId", userid1) + .orderByDesc("create_date")); + String conTent = ""; + Date date = null; + for (UserFollowUpEntity followUp : followUpEntity) { + conTent = followUp.getConTent(); + date = followUp.getCreateDate(); + + } + + map.put("followUpdate", date); + map.put("followUpcontent", conTent); + map.put("avatar", usser); + map.put("name", name); + map.put("bookid", bookid1); + map.put("orderSn", userRecord.getOrderSn()); + map.put("userid", userid1); + map.put("content", userRecord.getContent()); + map.put("images", userRecord.getImages()); + map.put("starlevel", userRecord.getStarLevel()); + map.put("createdate", userRecord.getCreateDate()); + list.add(map); + + + + } + return R.ok().put("list", list); + } + + + + /** + * 信息 + */ + @RequestMapping("/info/{id}") + public R info(@PathVariable("id") Integer id){ + UserRecordEntity userRecordEntity = userRecordService.getById(id); + return R.ok().put("bookChapterContent", userRecordEntity); + } + + /** + * 保存 + */ + @RequestMapping("/save") + public R save(@RequestBody UserRecordEntity userRecordEntity){ + userRecordService.save(userRecordEntity); + return R.ok(); + } + + /** + * 修改 + */ + @RequestMapping("/update") + public R update(@RequestBody UserRecordEntity userRecordEntity){ + userRecordService.updateById(userRecordEntity); + return R.ok(); + } + + /** + * 删除 + */ + @RequestMapping("/delete") + public R delete(@RequestBody Integer[] ids){ + userRecordService.removeByIds(Arrays.asList(ids)); + userRecordService.getBaseMapper().deleteBatchIds(Arrays.asList(ids)); + return R.ok(); + } + + + /* + * test + * */ + @RequestMapping("/commodityComment") + public R commodityComment(String userid, String orderSn, String starLevel, String comment){ + userRecordService.commodityComment(userid, orderSn, starLevel, comment); + return R.ok(); +} + + + + + + /* + * 生成评论 + * */ + @RequestMapping("/comment") + public Object commodityComments( Integer userid, String orderSn, Integer bookid, String comment) { + + + BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper() + .eq("order_sn",orderSn).last("LIMIT 1").eq("order_status","3") + //状态3为已收货 +// .eq("order_status","3") + ); + UserRecordEntity userRecordEntity = new UserRecordEntity(); + + + if (!ToolObject.isNullOrEmpty(buyOrderEntity)) + { + return error("您已评价过了，请勿重复评论"); +// + }else { + userRecordEntity.setId(buyOrderEntity.getOrderId()); + userRecordEntity.setContent(comment); + //商品评价 + userRecordEntity.setBookid(bookid); + userRecordEntity.setUserid(userid); + userRecordEntity.setOrderSn(orderSn); + userRecordEntity.setOrderCode(userRecordEntity.getOrderCode()); + userRecordEntity.setDelflag(0); + userRecordService.saveOrUpdate(userRecordEntity); + return R.ok("成功").put("userRecordEntity",userRecordEntity); + } + + + } + + + + /** + * + * @param recordEntity + * @return 生成评论（上传图片，星级评价 + * + */ + @RequestMapping("/UserRecordcomment") + public R commodity(@RequestBody UserRecordEntity recordEntity ) { + //todo 已收货限制字段，只可评价一次 + BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper() + .eq("order_sn",recordEntity.getOrderSn()) + ); + + Integer orderId = buyOrderEntity.getOrderId(); + BuyOrderDetailEntity detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper().eq("Order_id", orderId).eq("product_id",recordEntity.getBookid())); + Integer orderId1 = detailEntity.getOrderId(); + UserRecordEntity userRecordEntity = userRecordService.getBaseMapper().selectOne(new QueryWrapper().eq("orderSn", recordEntity.getOrderSn()).eq("userid", recordEntity.getUserid()).eq("orderdid",orderId1).last("LIMIT 1")); + + if (userRecordEntity != null) { + return R.error("您已评价过"); + } + if (recordEntity.getImages()!=null) { + List> imageList = (ArrayList>) recordEntity.getImages(); + String imageStr = ""; + for (Map m : imageList) { + imageStr += m.get("url") + ","; + + } + + + + recordEntity.setImages(imageStr); + } + recordEntity.setDelflag(0); + recordEntity.setOrderdid(orderId1); + userRecordService.saveOrUpdate(recordEntity); + + + detailEntity.setRecordId(1); + buyOrderDetailService.saveOrUpdate(detailEntity); + + + + return R.ok("成功").put("userRecordEntity",recordEntity); + } +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java new file mode 100644 index 00000000..73cc8cec --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookClockinCommentDao.java @@ -0,0 +1,10 @@ +package com.peanut.modules.book.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookClockinCommentEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookClockinCommentDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java new file mode 100644 index 00000000..03f3d925 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookClockinDao.java @@ -0,0 +1,12 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookClockinEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookClockinDao extends BaseMapper { + + + +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java b/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java new file mode 100644 index 00000000..402cf1ed --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookClockinPunchDao.java @@ -0,0 +1,13 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookClockinPunchEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookClockinPunchDao extends BaseMapper { + + + + +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java b/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java new file mode 100644 index 00000000..4ae8cef5 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookForumArticlesDao.java @@ -0,0 +1,10 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookForumArticlesEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookForumArticlesDao extends BaseMapper { + +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookForumCommentDao.java b/src/main/java/com/peanut/modules/book/dao/BookForumCommentDao.java new file mode 100644 index 00000000..bb0c7fcf --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookForumCommentDao.java @@ -0,0 +1,10 @@ +package com.peanut.modules.book.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookForumCommentEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookForumCommentDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookListeningDao.java b/src/main/java/com/peanut/modules/book/dao/BookListeningDao.java new file mode 100644 index 00000000..ef59355f --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookListeningDao.java @@ -0,0 +1,11 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookListeningEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookListeningDao extends BaseMapper { + + +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookListeningShelfDao.java b/src/main/java/com/peanut/modules/book/dao/BookListeningShelfDao.java new file mode 100644 index 00000000..ba673278 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookListeningShelfDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookListeningShelfEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookListeningShelfDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/BookTaskDao.java b/src/main/java/com/peanut/modules/book/dao/BookTaskDao.java new file mode 100644 index 00000000..7db62b35 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/BookTaskDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.BookTaskEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BookTaskDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/PayIOSOrderDao.java b/src/main/java/com/peanut/modules/book/dao/PayIOSOrderDao.java new file mode 100644 index 00000000..7c719306 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/PayIOSOrderDao.java @@ -0,0 +1,13 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.pay.IOSPay.model.entities.IosPayOrderEntity; +import org.apache.ibatis.annotations.Mapper; + + +/* +* 内购订单表 +* */ +@Mapper +public interface PayIOSOrderDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/UserFeedbackDao.java b/src/main/java/com/peanut/modules/book/dao/UserFeedbackDao.java new file mode 100644 index 00000000..12f60aa6 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/UserFeedbackDao.java @@ -0,0 +1,9 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.UserFeedbackEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserFeedbackDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/UserFollowUpDao.java b/src/main/java/com/peanut/modules/book/dao/UserFollowUpDao.java new file mode 100644 index 00000000..01664975 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/UserFollowUpDao.java @@ -0,0 +1,10 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.UserFollowUpEntity; +import com.peanut.modules.book.entity.UserRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface UserFollowUpDao extends BaseMapper { +} diff --git a/src/main/java/com/peanut/modules/book/dao/UserRecordDao.java b/src/main/java/com/peanut/modules/book/dao/UserRecordDao.java new file mode 100644 index 00000000..bfea7540 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/dao/UserRecordDao.java @@ -0,0 +1,13 @@ +package com.peanut.modules.book.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.peanut.modules.book.entity.UserEbookBuyEntity; +import com.peanut.modules.book.entity.UserRecordEntity; +import org.apache.ibatis.annotations.Mapper; + + +//书籍评价表 +@Mapper +public interface UserRecordDao extends BaseMapper { + +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookClockinCommentEntity.java b/src/main/java/com/peanut/modules/book/entity/BookClockinCommentEntity.java new file mode 100644 index 00000000..ee2cedec --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookClockinCommentEntity.java @@ -0,0 +1,74 @@ +package com.peanut.modules.book.entity; + + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("book_clockin_comment") +public class BookClockinCommentEntity implements Serializable { + @TableId + private Integer id; + /** + * 签到表关联id + */ + @TableField("task_id") + private Integer taskId; + /** + * 图书id + */ + @TableField("book_id") + private Integer bookId; + /** + * 用户id + */ + @TableField("user_id") + private Integer userId; + /** + * 删除 + */ + @TableField("del_flag") + private Integer delFlag; + /** + * 图片 + */ + @TableField("images") + private String images; + /** + * 内容 + */ + @TableField("content") + private String content; + /** + * 点赞总数 + */ + @TableField("like_sum") + private String likeSum; + /** + *创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + *修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 关联评论 + */ + @TableField("pid") + private Integer pid; + + + + + + + + +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookClockinEntity.java b/src/main/java/com/peanut/modules/book/entity/BookClockinEntity.java new file mode 100644 index 00000000..2d554905 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookClockinEntity.java @@ -0,0 +1,120 @@ +package com.peanut.modules.book.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; + +/** + * + * 打卡表 + * @author + * @email + * @date + */ +@Data +@TableName("book_clockin") +public class BookClockinEntity implements Serializable { + + /** + * id book_id user_id content clockin_sum + * clockin_days create_time update_time del_flag + * images voices like like_sum comment_sum + */ + + /** + * + */ + @TableId + private Integer id; + /** + * + */ + @TableField("book_id") + private Integer bookId; + /** + * + */ + @TableField("user_id") + private Integer userId; + /** + * + */ + @TableField("content") + private String content; + /** + * + */ + @TableField("clockin_sum") + private String clockinSum; + + + /** + * 集合 + */ + @TableField(exist = false) + private Object imageeStrings; + /** + *创建注解 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + /** + * + */ + @TableLogic + private Integer delFlag; + /** + * + */ + @TableField("images") + private Object images; + /** + * + */ + @TableField("voices") + private String voices; + /** + * + */ + @TableField("like_s") + private String likes; + + /** + * + */ + @TableField(" like_sum") + private String likeSum; + /** + * + */ + @TableField(" comment_sum") + private String commentSum; + + //taskId 与 dayId 反转存储 + + + /** + * + * 打卡对应天id + */ + @TableField("day_id") + private Integer dayId; + /** + * 列表id + * + */ + @TableField("task_id") + private Integer taskId; + + + + +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookClockinPunchEntity.java b/src/main/java/com/peanut/modules/book/entity/BookClockinPunchEntity.java new file mode 100644 index 00000000..1778a753 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookClockinPunchEntity.java @@ -0,0 +1,55 @@ +package com.peanut.modules.book.entity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.io.Serializable; +import java.util.Date; + +/** + * 签到 + */ +@Data +@TableName("book_clockin_punch") +public class BookClockinPunchEntity implements Serializable { + + /** + * + */ + @TableId + private Integer id; + /** + * + */ + @TableField("book_id") + private Integer bookId; + /** + * + */ + @TableField("user_id") + private Integer userId; + /** + * + */ + @TableField("days") + private Integer days; + /** + *创建注解 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + /** + * + */ + @TableField("t_id") + private Integer tId; + + + + @TableLogic + private Integer delFlag; + +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookForumArticlesEntity.java b/src/main/java/com/peanut/modules/book/entity/BookForumArticlesEntity.java new file mode 100644 index 00000000..60e23701 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookForumArticlesEntity.java @@ -0,0 +1,71 @@ +package com.peanut.modules.book.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; + +/** + * 文章表主表 + * + */ +@Data +@TableName("book_forum_articles") +public class BookForumArticlesEntity { + + /** + * id + */ + @TableId + private Integer id; + /** + *标题 + */ + @TableField("title") + private String title; + /** + *用户id + */ + @TableField("userid") + private Integer userid; + /** + *内容 + */ + @TableField("content") + private String content; + /** + *图片 + */ + @TableField("image") + private String image; + /** + *多图 + */ + @TableField("imagelist") + private String imagelist; + /** + *图书id + */ + @TableField("bookid") + private Integer bookid; + /** + *开始时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * 修改时间 + */ + + @TableField(fill = FieldFill.INSERT_UPDATE)//更新注解; + private Date updateTime; + /** + * 点赞数 + */ + @TableField("contlike") + private Date contlike; + + @TableField("del_flag") + @TableLogic + private Integer delflag; +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookForumCommentEntity.java b/src/main/java/com/peanut/modules/book/entity/BookForumCommentEntity.java new file mode 100644 index 00000000..7b4bca6d --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookForumCommentEntity.java @@ -0,0 +1,63 @@ +package com.peanut.modules.book.entity; + + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.util.Date; + +/** + * 评价文章表 + * + */ +@Data +@TableName("book_forum_comment") +public class BookForumCommentEntity { + +/** + * id bfa_id userid content images create_time update_time + */ + /** + * id + */ + @TableId + private Integer id; + /** + *文章父id + */ + @TableField("bfa_id") + private String bfaid; + /** + *用户评论id + */ + @TableField("userid") + private String userid; + /** + *内容 + */ + @TableField("content") + private String content; + /** + *图片 + */ + @TableField("image") + private String image; + /** + *开始时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + *修改时间 + */ + @TableField(fill = FieldFill.UPDATE) + private Date updateTime; + /** + * 删除 + */ + @TableField("del_flag") + @TableLogic + private Integer delflag; + @TableField("book_id") + private Integer bookid; +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookListeningEntity.java b/src/main/java/com/peanut/modules/book/entity/BookListeningEntity.java new file mode 100644 index 00000000..87812e76 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookListeningEntity.java @@ -0,0 +1,74 @@ +package com.peanut.modules.book.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 听书进度表 + * + */ +@Data +@TableName("book_listening") +public class BookListeningEntity implements Serializable { + /** + * + */ + @TableId + private Integer id; + /** + * 用户id + */ + @TableField("user_id") + private Integer userId; + /** + * 图书id + */ + @TableField("book_id") + private Integer bookId; + /** + * 章节id + */ + @TableField("chapter_id") + private Integer chapterId; + /** + * 章节名称 + */ + @TableField("chapter_name") + private String chapterName; + /** + * 章节百分比 + */ + @TableField("precent") + private Integer precent; + /** + * 章节内容id + */ + @TableField("content_id") + private Integer contentId; + /** + * 创建时间 + */ + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + /** + * + */ + private Integer sort; + /** + * + */ + private String delFlag; + + + + +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookListeningShelfEntity.java b/src/main/java/com/peanut/modules/book/entity/BookListeningShelfEntity.java new file mode 100644 index 00000000..e7fab6cf --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookListeningShelfEntity.java @@ -0,0 +1,51 @@ +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 lombok.Data; + +import java.util.Date; + +@Data +@TableName("book_listening_shelf") +public class BookListeningShelfEntity { + + + @TableId + private Integer id; + /** + * 图书 + */ + @TableField("book_id") + private Integer bookid; + /** + * 用户id + */ + @TableField("user_id") + private Integer userid; + /** + * 图书名称 + */ + @TableField("book_name") + private Integer bookname; + /** + * 删除标记 + */ + @TableField("del_flag") + private Integer delflag; + /** + * 创建时间 + */ + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + +} diff --git a/src/main/java/com/peanut/modules/book/entity/BookTaskEntity.java b/src/main/java/com/peanut/modules/book/entity/BookTaskEntity.java new file mode 100644 index 00000000..84b791e3 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/BookTaskEntity.java @@ -0,0 +1,84 @@ +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 lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 签到列表内容 + * + */ +@Data +@TableName("book_task") +public class BookTaskEntity implements Serializable { + /** + * + */ + @TableId + private Integer id; + /** + * + */ + @TableField("book_id") + private Integer bookid; + /** + * + */ + @TableField("content") + private String content; + /** + * + */ + @TableField("images") + private String images; + /** + * + */ + @TableField("voices") + private String voices; + /** + * + */ + @TableField("like_sun") + private String likesun; + + /** + * + */ + @TableField("days") + private String days; + /** + * + */ + + @TableField(fill = FieldFill.INSERT) + private Date createTime; + /** + * + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + + /** + * 删除标记 + */ + @TableField("del_flag") + private Integer delFlag; + + @TableField("video") + private String video; + + @TableField("heading") + private String heading; + + + + +} diff --git a/src/main/java/com/peanut/modules/book/entity/UserAppAuthorEntity.java b/src/main/java/com/peanut/modules/book/entity/UserAppAuthorEntity.java new file mode 100644 index 00000000..1bfc3442 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/UserAppAuthorEntity.java @@ -0,0 +1,22 @@ +package com.peanut.modules.book.entity; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Data +public class UserAppAuthorEntity { + //新旧app 用来备份 自定义数据 + @NotNull(message = "类型不能为空") + @NotEmpty(message = "类型不能为空") + private String type; + + //重点需要 app调起微信获取到的code + @NotEmpty(message = "code不能为空") + @NotNull(message = "code不能为空") + private String code; + + + +} diff --git a/src/main/java/com/peanut/modules/book/entity/UserFeedbackEntity.java b/src/main/java/com/peanut/modules/book/entity/UserFeedbackEntity.java new file mode 100644 index 00000000..8bc45dca --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/UserFeedbackEntity.java @@ -0,0 +1,66 @@ +package com.peanut.modules.book.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import java.util.Date; + +/** + * 追评追评（不限制） + */ +@Data +@TableName("user_feedback") +public class UserFeedbackEntity { + + + /** + * 用户id + */ + @TableId + private Integer id; + /** + * 用户id + */ + @TableField("userId") + private Integer userId; + /** + * 关联追加id + */ + @TableField("fu_id") + private Integer fuid; + /** + * 关联评价id + */ + @TableField("r_id") + private String rid; + /** + * 内容 + */ + @TableField("content") + private String content; + /** + * 删除 + */ + @TableField("delFlag") + private Integer delFlag; + /** + * 订单号 + */ + @TableField("ordersn") + private Integer ordersn; + /** + * 开始时间 + */ + @Temporal(TemporalType.TIMESTAMP) + private Date create_date; + + /** + * 图书id + */ + @TableField("bookid") + private Integer bookid; +} diff --git a/src/main/java/com/peanut/modules/book/entity/UserFollowUpEntity.java b/src/main/java/com/peanut/modules/book/entity/UserFollowUpEntity.java new file mode 100644 index 00000000..ac0a73af --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/UserFollowUpEntity.java @@ -0,0 +1,79 @@ +package com.peanut.modules.book.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import java.util.Date; + +/** + * 追评表 + */ +@Data +@TableName("user_follow_up") +public class UserFollowUpEntity { + /** + * 用户id + */ + @TableId + private Integer id; + /** + * id + */ + @TableField("userId") + private Integer userId; + /** + * 关联父评价id + */ + @TableField("oid") + private Integer oid; + /** + * 内容 + */ + @TableField("conTent") + private String conTent; + /** + * 点赞 + */ + @TableField("praIse") + private String praIse; + /** + * 图片url + */ + @TableField("images") + private Object images; + /** + * 删除 + */ + @TableLogic + private Integer delflag; + /** + * 图书id + */ + @TableField("bookid") + private Integer bookid; + /** + * 开始时间 + */ + @Temporal(TemporalType.TIMESTAMP) + private Date createDate; + + /** + * 星级 + */ + @TableField("starLevel") + private Integer starLevel; + + + + /** + * 星级 + */ + @TableField("emojis") + private String emojis; + +} diff --git a/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java b/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java new file mode 100644 index 00000000..94865746 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java @@ -0,0 +1,75 @@ +package com.peanut.modules.book.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.peanut.modules.book.to.UserRecordDto; +import lombok.Data; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Data +@TableName("user_record") +public class UserRecordEntity { + + + @TableId + private Integer id; + + // 创建日期 + @Temporal(TemporalType.TIMESTAMP) + private Date createDate = new Date(); + + // 类型（商品评价01,听书评价02，观看电子书评价03） + @TableField("type") + private String type ; + + // 内容 + @TableField("content") + private Object content ; + //快递单号 + @TableField("orderCode") + private String orderCode; + //订单号 + @TableField("orderSn") + private String orderSn; + // 关联客户 + @TableField("userid") + private Integer userid ; + //逻辑删除：未删除0 -1删除 + @TableField("delFlag") + @TableLogic + private Integer delflag; + //关联图书id + @TableField("bookid") + private Integer bookid ; + //图片url +// @TableField("images") +// private String[] images; + @TableField("images") + private Object images; + + //星级 1=一星，5=五星 + @TableField("starLevel") + private String starLevel; + + /** + * 表情存储 + */ + @TableField("emoji") + private Object emoji; + + @TableField("name") + private Object name; + @TableField("tag") + private Object tag; + + @TableField("orderdid") + private Integer orderdid; + + +} diff --git a/src/main/java/com/peanut/modules/book/service/BookClockinCommentService.java b/src/main/java/com/peanut/modules/book/service/BookClockinCommentService.java new file mode 100644 index 00000000..a9617004 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookClockinCommentService.java @@ -0,0 +1,12 @@ +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.BookClockinCommentEntity; + +import java.util.Map; + +public interface BookClockinCommentService extends IService { + PageUtils queryPage(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookClockinPunchService.java b/src/main/java/com/peanut/modules/book/service/BookClockinPunchService.java new file mode 100644 index 00000000..eb134aff --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookClockinPunchService.java @@ -0,0 +1,15 @@ +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.BookClockinEntity; +import com.peanut.modules.book.entity.BookClockinPunchEntity; + +import java.util.Map; + +public interface BookClockinPunchService extends IService { + + + PageUtils queryPage(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookClockinService.java b/src/main/java/com/peanut/modules/book/service/BookClockinService.java new file mode 100644 index 00000000..60549621 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookClockinService.java @@ -0,0 +1,15 @@ +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.BookClockinEntity; + +import java.util.Map; + +public interface BookClockinService extends IService { + PageUtils queryPage(Map params); + + + + PageUtils queryPagemylist(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookForumArticlesService.java b/src/main/java/com/peanut/modules/book/service/BookForumArticlesService.java new file mode 100644 index 00000000..ec304bb3 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookForumArticlesService.java @@ -0,0 +1,13 @@ +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.BookForumArticlesEntity; + +import java.util.Map; + +public interface BookForumArticlesService extends IService { + PageUtils queryPage(Map params); + + PageUtils queryPages(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookForumCommenService.java b/src/main/java/com/peanut/modules/book/service/BookForumCommenService.java new file mode 100644 index 00000000..e59a9ff6 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookForumCommenService.java @@ -0,0 +1,11 @@ +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.BookForumCommentEntity; + +import java.util.Map; + +public interface BookForumCommenService extends IService { + PageUtils queryPage(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookListeningService.java b/src/main/java/com/peanut/modules/book/service/BookListeningService.java new file mode 100644 index 00000000..099b9263 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookListeningService.java @@ -0,0 +1,13 @@ +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.BookListeningEntity; + +import java.util.Map; + +public interface BookListeningService extends IService { + + + PageUtils queryPage(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookListeningShelfService.java b/src/main/java/com/peanut/modules/book/service/BookListeningShelfService.java new file mode 100644 index 00000000..bb14c369 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookListeningShelfService.java @@ -0,0 +1,12 @@ +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.BookListeningShelfEntity; + +import java.util.Map; + +public interface BookListeningShelfService extends IService { + PageUtils queryPage(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/BookTaskService.java b/src/main/java/com/peanut/modules/book/service/BookTaskService.java new file mode 100644 index 00000000..95f68a38 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/BookTaskService.java @@ -0,0 +1,13 @@ +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.BookTaskEntity; + +import java.util.Map; + +public interface BookTaskService extends IService { + PageUtils queryPage(Map params); + + PageUtils queryPageServi(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/UserFeedbackSerivce.java b/src/main/java/com/peanut/modules/book/service/UserFeedbackSerivce.java new file mode 100644 index 00000000..2961b9a5 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/UserFeedbackSerivce.java @@ -0,0 +1,7 @@ +package com.peanut.modules.book.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.peanut.modules.book.entity.UserFeedbackEntity; + +public interface UserFeedbackSerivce extends IService { +} diff --git a/src/main/java/com/peanut/modules/book/service/UserFollowUpService.java b/src/main/java/com/peanut/modules/book/service/UserFollowUpService.java new file mode 100644 index 00000000..3384f8d9 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/UserFollowUpService.java @@ -0,0 +1,11 @@ +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.UserFollowUpEntity; + +import java.util.Map; + +public interface UserFollowUpService extends IService { + PageUtils queryPage(Map params); +} diff --git a/src/main/java/com/peanut/modules/book/service/UserRecordService.java b/src/main/java/com/peanut/modules/book/service/UserRecordService.java new file mode 100644 index 00000000..ffcc6e10 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/UserRecordService.java @@ -0,0 +1,25 @@ +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.BuyOrderEntity; +import com.peanut.modules.book.entity.UserRecordEntity; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +public interface UserRecordService extends IService { + + + //todo 传参参数 用户id 购买订单id 星级评价 内容 + public Object commodityComment(String userid, String orderSn, String starLevel, String comment); + + PageUtils queryPage(Map params); + + String uploadFile(MultipartFile file); + List uploadFiles(List files); + + ; +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookClockinCommentServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookClockinCommentServiceImpl.java new file mode 100644 index 00000000..66795051 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookClockinCommentServiceImpl.java @@ -0,0 +1,30 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookClockinCommentDao; +import com.peanut.modules.book.entity.BookClockinCommentEntity; +import com.peanut.modules.book.entity.BookClockinEntity; +import com.peanut.modules.book.service.BookClockinCommentService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookClockinCommentServiceImpl extends ServiceImpl implements BookClockinCommentService{ + + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper().orderByDesc("create_time") + + ); + + return new PageUtils(page); + } +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookClockinPunchServiceImp.java b/src/main/java/com/peanut/modules/book/service/impl/BookClockinPunchServiceImp.java new file mode 100644 index 00000000..9a99e08e --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookClockinPunchServiceImp.java @@ -0,0 +1,34 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookClockinPunchDao; +import com.peanut.modules.book.entity.BookClockinPunchEntity; +import com.peanut.modules.book.service.BookClockinPunchService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookClockinPunchServiceImp extends ServiceImpl implements BookClockinPunchService { + @Override + public PageUtils queryPage(Map params) { + + Object book =params.get("bookid"); + Object days = params.get("days"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + .eq("book_id",book) + .eq("days",days) + .orderByDesc("create_time") + + ); + + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java new file mode 100644 index 00000000..4a57fc69 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java @@ -0,0 +1,45 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookClockinDao; +import com.peanut.modules.book.entity.BookClockinEntity; +import com.peanut.modules.book.service.BookClockinService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookClockinServiceImpl extends ServiceImpl implements BookClockinService { + + + @Override + public PageUtils queryPage(Map params) { + Object book =params.get("bookid"); + Object taskid = params.get("taskid"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + .eq("book_id",book) + .eq("task_id",taskid) + .orderByDesc("create_time") + + ); + + return new PageUtils(page); + } + + @Override + public PageUtils queryPagemylist(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + + ); + return new PageUtils(page); + } + +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookForumArticlesServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookForumArticlesServiceImpl.java new file mode 100644 index 00000000..d70dbfe8 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookForumArticlesServiceImpl.java @@ -0,0 +1,42 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookForumArticlesDao; +import com.peanut.modules.book.entity.BookForumArticlesEntity; +import com.peanut.modules.book.service.BookForumArticlesService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookForumArticlesServiceImpl extends ServiceImpl implements BookForumArticlesService { + + + + @Override + public PageUtils queryPage(Map params) { + String bookid = (String) params.get("bookid"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper().eq("bookid",bookid).orderByDesc("create_time") + + ); + + return new PageUtils(page); + } + + @Override + public PageUtils queryPages(Map params) { + String bookid = (String) params.get("bookid"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper().eq("bookid",bookid) + + ); + return new PageUtils(page); + } +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookForumCommenServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookForumCommenServiceImpl.java new file mode 100644 index 00000000..b0538725 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookForumCommenServiceImpl.java @@ -0,0 +1,31 @@ +package com.peanut.modules.book.service.impl; + +import cn.com.marsoft.base.impl.BaseServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookForumCommentDao; +import com.peanut.modules.book.entity.BookForumArticlesEntity; +import com.peanut.modules.book.entity.BookForumCommentEntity; +import com.peanut.modules.book.service.BookForumCommenService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookForumCommenServiceImpl extends ServiceImpl implements BookForumCommenService { + + + @Override + public PageUtils queryPage(Map params) { + String b = (String) params.get("bfa_id"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper().eq("bfa_id",b).orderByDesc("create_time") + ); + + return new PageUtils(page); + } +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookListeningServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookListeningServiceImpl.java new file mode 100644 index 00000000..5d0666d6 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookListeningServiceImpl.java @@ -0,0 +1,29 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookListeningDao; +import com.peanut.modules.book.entity.BookListeningEntity; +import com.peanut.modules.book.service.BookListeningService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service("bookListeningService") +public class BookListeningServiceImpl extends ServiceImpl implements BookListeningService{ + + + @Override + public PageUtils queryPage(Map params) { + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper() + ); + + return new PageUtils(page); + } + } + diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookListeningShelfServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookListeningShelfServiceImpl.java new file mode 100644 index 00000000..00d4543b --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookListeningShelfServiceImpl.java @@ -0,0 +1,26 @@ +package com.peanut.modules.book.service.impl; + +import cn.com.marsoft.base.impl.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.common.utils.PageUtils; +import com.peanut.modules.book.dao.BookListeningShelfDao; +import com.peanut.modules.book.entity.BookListeningShelfEntity; +import com.peanut.modules.book.service.BookListeningShelfService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookListeningShelfServiceImpl extends ServiceImpl implements BookListeningShelfService { + @Override + public PageUtils queryPage(Map params) { + + + + return null; + } + + + + +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java new file mode 100644 index 00000000..1393c30a --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/BookTaskServiceImpl.java @@ -0,0 +1,42 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.BookTaskDao; +import com.peanut.modules.book.entity.BookTaskEntity; +import com.peanut.modules.book.service.BookTaskService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class BookTaskServiceImpl extends ServiceImpl implements BookTaskService { + + + @Override + public PageUtils queryPage(Map params) { + Object bookid = params.get("bookid"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper().eq("book_id",bookid).orderByDesc("days") + + ); + + return new PageUtils(page); + } + + @Override + public PageUtils queryPageServi(Map params) { + Object bookid = params.get("bookid"); + Object days = params.get("days"); + IPage page = this.page( + new Query().getPage(params), + new QueryWrapper().eq("book_id",bookid).orderByDesc("create_time").eq("days",days) + ); + + return new PageUtils(page); + } +} \ No newline at end of file diff --git a/src/main/java/com/peanut/modules/book/service/impl/UserFeedbackServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/UserFeedbackServiceImpl.java new file mode 100644 index 00000000..08eb20dc --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/UserFeedbackServiceImpl.java @@ -0,0 +1,12 @@ +package com.peanut.modules.book.service.impl; + +import cn.com.marsoft.base.impl.BaseServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.modules.book.dao.UserFeedbackDao; +import com.peanut.modules.book.entity.UserFeedbackEntity; +import com.peanut.modules.book.service.UserFeedbackSerivce; +import org.springframework.stereotype.Service; + +@Service +public class UserFeedbackServiceImpl extends ServiceImpl implements UserFeedbackSerivce { +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/UserFollowUpServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/UserFollowUpServiceImpl.java new file mode 100644 index 00000000..e1b3abc2 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/UserFollowUpServiceImpl.java @@ -0,0 +1,35 @@ +package com.peanut.modules.book.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.UserFollowUpDao; +import com.peanut.modules.book.entity.UserFollowUpEntity; +import com.peanut.modules.book.entity.UserRecordEntity; +import com.peanut.modules.book.service.UserFollowUpService; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class UserFollowUpServiceImpl extends ServiceImpl implements UserFollowUpService { + + + @Override + public PageUtils queryPage(Map params) { + String bookid = (String) params.get("bookid"); + IPage page =page( + new Query().getPage(params), + new QueryWrapper() + //订单号，开始时间 + .eq("userid",bookid).orderByDesc("create_date") +// .eq("") + + ); + + return new PageUtils(page); + } + +} diff --git a/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java new file mode 100644 index 00000000..e50d871d --- /dev/null +++ b/src/main/java/com/peanut/modules/book/service/impl/UserRecordServiceImpl.java @@ -0,0 +1,113 @@ +package com.peanut.modules.book.service.impl; +import com.aliyun.oss.OSS; +import com.aliyun.oss.OSSClientBuilder; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.peanut.common.utils.*; +import com.peanut.modules.book.dao.UserRecordDao; +import com.peanut.modules.book.entity.UserRecordEntity; +import com.peanut.modules.book.service.UserRecordService; +import org.joda.time.DateTime; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.multipart.MultipartFile; + +import java.io.InputStream; +import java.util.*; + + +@Service("UserRecordServiceImpl") +public class UserRecordServiceImpl extends ServiceImpl implements UserRecordService { + + + + + @Override + public Object commodityComment(String userid, String orderSn, String starLevel, String comment) { + + + + return R.ok("成功"); + } + + @Override + public PageUtils queryPage(Map params) { + String orderSn = (String) params.get("orderSn"); + IPage page =page( + new Query().getPage(params), + new QueryWrapper() + //订单号，开始时间 + .eq("orderSn",orderSn).orderByDesc("create_time") +// .eq("") + + ); + + return new PageUtils(page); + } + + @Override + public String uploadFile(MultipartFile file) { + + String endpoint = ConstantPropertiesUtils.END_POIND; + String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID; + String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET; + String bucketName = ConstantPropertiesUtils.BUCKET_NAME; + + try { + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); + + InputStream inputStream = file.getInputStream(); + String fileName = file.getOriginalFilename(); + String uuid = UUID.randomUUID().toString().replaceAll("-", ""); + fileName = uuid + fileName; + String datePath = new DateTime().toString("yyyy/MM/dd"); + fileName = datePath + "/" + fileName; + ossClient.putObject(bucketName, fileName, inputStream); + ossClient.shutdown(); + String url = "https://" + bucketName + "." + endpoint + "/" + fileName; + return url; + } catch (Exception e) { + e.printStackTrace(); + return null; + } + + + } + + + @Override + public List uploadFiles(List files) { + String endpoint = ConstantPropertiesUtils.END_POIND; + String accessKeyId = ConstantPropertiesUtils.ACCESS_KEY_ID; + String accessKeySecret = ConstantPropertiesUtils.ACCESS_KEY_SECRET; + String bucketName = ConstantPropertiesUtils.BUCKET_NAME; + try { + //创建oss实例 + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret); + List urls = new ArrayList<>(); + for (MultipartFile file : files) { + InputStream inputStream = file.getInputStream(); + String fileName = file.getOriginalFilename(); + String uuid = UUID.randomUUID().toString().replaceAll("-", ""); + fileName = uuid + fileName; + String datePath = new DateTime().toString("yyyy/MM/dd"); + fileName = datePath + "/" + fileName; + ossClient.putObject(bucketName, fileName, inputStream); + urls.add("https://" + bucketName + "." + endpoint + "/" + fileName); + } + //关闭资源否则会导致OLD区逐渐的变大，直到内存泄漏 + ossClient.shutdown(); + return urls; + } catch (Exception e) { + e.printStackTrace(); + return null; + + } + + } + + +} + + diff --git a/src/main/java/com/peanut/modules/book/to/UserRecordDto.java b/src/main/java/com/peanut/modules/book/to/UserRecordDto.java new file mode 100644 index 00000000..d675013b --- /dev/null +++ b/src/main/java/com/peanut/modules/book/to/UserRecordDto.java @@ -0,0 +1,23 @@ +package com.peanut.modules.book.to; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; + +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class UserRecordDto implements Serializable { + + + + private String[] images; + + + + +} diff --git a/src/main/java/com/peanut/modules/book/vo/BookOrderVo.java b/src/main/java/com/peanut/modules/book/vo/BookOrderVo.java new file mode 100644 index 00000000..691f7251 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/vo/BookOrderVo.java @@ -0,0 +1,62 @@ +package com.peanut.modules.book.vo; + +import java.io.Serializable; +import java.util.Date; + +public class BookOrderVo implements Serializable { + + private String orderStatus; + private String fmsHtml; + private Date creatTime; + private String shipperCode; + private String shipperName; + private String isPrint; + + public String getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(String orderStatus) { + this.orderStatus = orderStatus; + } + + public String getFmsHtml() { + return fmsHtml; + } + + public void setFmsHtml(String fmsHtml) { + this.fmsHtml = fmsHtml; + } + + public Date getCreatTime() { + return creatTime; + } + + public void setCreatTime(Date creatTime) { + this.creatTime = creatTime; + } + + public String getShipperCode() { + return shipperCode; + } + + public void setShipperCode(String shipperCode) { + this.shipperCode = shipperCode; + } + + public String getShipperName() { + return shipperName; + } + + public void setShipperName(String shipperName) { + this.shipperName = shipperName; + } + + public String getIsPrint() { + return isPrint; + } + + public void setIsPrint(String isPrint) { + this.isPrint = isPrint; + } +} diff --git a/src/main/resources/mapper/book/BookClockinCommentDao.xml b/src/main/resources/mapper/book/BookClockinCommentDao.xml new file mode 100644 index 00000000..98cc1699 --- /dev/null +++ b/src/main/resources/mapper/book/BookClockinCommentDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/BookClockinDao.xml b/src/main/resources/mapper/book/BookClockinDao.xml new file mode 100644 index 00000000..eb00e828 --- /dev/null +++ b/src/main/resources/mapper/book/BookClockinDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/BookClockinPunchDao.xml b/src/main/resources/mapper/book/BookClockinPunchDao.xml new file mode 100644 index 00000000..e1aaffdc --- /dev/null +++ b/src/main/resources/mapper/book/BookClockinPunchDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/BookForumArticlesDao.xml b/src/main/resources/mapper/book/BookForumArticlesDao.xml new file mode 100644 index 00000000..047eba07 --- /dev/null +++ b/src/main/resources/mapper/book/BookForumArticlesDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/BookForumCommentDao.xml b/src/main/resources/mapper/book/BookForumCommentDao.xml new file mode 100644 index 00000000..f81c5f77 --- /dev/null +++ b/src/main/resources/mapper/book/BookForumCommentDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/BookListeningDao.xml b/src/main/resources/mapper/book/BookListeningDao.xml new file mode 100644 index 00000000..3ddc5ee8 --- /dev/null +++ b/src/main/resources/mapper/book/BookListeningDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/BookTaskDao.xml b/src/main/resources/mapper/book/BookTaskDao.xml new file mode 100644 index 00000000..ee46f8ea --- /dev/null +++ b/src/main/resources/mapper/book/BookTaskDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/PayIOSOrderDao.xml b/src/main/resources/mapper/book/PayIOSOrderDao.xml new file mode 100644 index 00000000..f27d9d27 --- /dev/null +++ b/src/main/resources/mapper/book/PayIOSOrderDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/UserFeedbackDao.xml b/src/main/resources/mapper/book/UserFeedbackDao.xml new file mode 100644 index 00000000..1ea7bab5 --- /dev/null +++ b/src/main/resources/mapper/book/UserFeedbackDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/UserFollowUpDao.xml b/src/main/resources/mapper/book/UserFollowUpDao.xml new file mode 100644 index 00000000..81a96301 --- /dev/null +++ b/src/main/resources/mapper/book/UserFollowUpDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/book/UserRecordDao.xml b/src/main/resources/mapper/book/UserRecordDao.xml new file mode 100644 index 00000000..9a839764 --- /dev/null +++ b/src/main/resources/mapper/book/UserRecordDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file