From 928cb2417fb6d76b2f3e9d5376d3d729585742e3 Mon Sep 17 00:00:00 2001 From: xiaoyang Date: Fri, 28 May 2021 20:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=AF=B4=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serialize/CommentUserNameSerialize.java | 20 +++ .../java2nb/novel/page/PageController.java | 49 ++++-- .../com/java2nb/novel/vo/BookCommentVO.java | 3 + .../resources/templates/book/book_detail.html | 159 ++++++++---------- 4 files changed, 128 insertions(+), 103 deletions(-) create mode 100644 novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java diff --git a/novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java b/novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java new file mode 100644 index 0000000..8e86da2 --- /dev/null +++ b/novel-front/src/main/java/com/java2nb/novel/core/serialize/CommentUserNameSerialize.java @@ -0,0 +1,20 @@ +package com.java2nb.novel.core.serialize; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; + +public class CommentUserNameSerialize extends JsonSerializer { + + @Override + public void serialize(String s, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + + if(StringUtils.isNotBlank(s)){ + jsonGenerator.writeString(s.substring(0, 4) + "****" + s.substring(s.length() - 3)); + } + + } +} \ No newline at end of file diff --git a/novel-front/src/main/java/com/java2nb/novel/page/PageController.java b/novel-front/src/main/java/com/java2nb/novel/page/PageController.java index 0c88e76..779c6f5 100644 --- a/novel-front/src/main/java/com/java2nb/novel/page/PageController.java +++ b/novel-front/src/main/java/com/java2nb/novel/page/PageController.java @@ -1,6 +1,7 @@ package com.java2nb.novel.page; import com.java2nb.novel.controller.BaseController; +import com.java2nb.novel.core.bean.PageBean; import com.java2nb.novel.core.bean.UserDetails; import com.java2nb.novel.core.utils.ThreadLocalUtil; import com.java2nb.novel.entity.*; @@ -8,6 +9,7 @@ import com.java2nb.novel.service.AuthorService; import com.java2nb.novel.service.BookService; import com.java2nb.novel.service.NewsService; import com.java2nb.novel.service.UserService; +import com.java2nb.novel.vo.BookCommentVO; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -78,7 +80,7 @@ public class PageController extends BaseController { */ @RequestMapping(path = {"/", "/index", "/index.html"}) public String index(Model model) { - model.addAttribute("bookMap",bookService.listBookSettingVO()); + model.addAttribute("bookMap", bookService.listBookSettingVO()); return ThreadLocalUtil.getTemplateDir() + "index"; } @@ -106,13 +108,42 @@ public class PageController extends BaseController { @SneakyThrows @RequestMapping("/book/{bookId}.html") public String bookDetail(@PathVariable("bookId") Long bookId, Model model) { - Book book = bookService.queryBookDetail(bookId); - model.addAttribute("book", book); - if (book.getLastIndexId() != null) { - //查询首章目录ID - Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId); - model.addAttribute("firstBookIndexId", firstBookIndexId); - } + //加载小说基本信息线程 + CompletableFuture bookCompletableFuture = CompletableFuture.supplyAsync(() -> { + //查询书籍 + Book book = bookService.queryBookDetail(bookId); + log.debug("加载小说基本信息线程结束"); + return book; + }, threadPoolExecutor); + //加载小说评论列表线程 + CompletableFuture> bookCommentPageBeanCompletableFuture = CompletableFuture.supplyAsync(() -> { + PageBean bookCommentVOPageBean = bookService.listCommentByPage(null, bookId, 1, 5); + log.debug("加载小说评论列表线程结束"); + return bookCommentVOPageBean; + }, threadPoolExecutor); + //加载小说首章信息线程，该线程在加载小说基本信息线程执行完毕后才执行 + CompletableFuture firstBookIndexIdCompletableFuture = bookCompletableFuture.thenApplyAsync((book) -> { + if (book.getLastIndexId() != null) { + //查询首章目录ID + Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId); + log.debug("加载小说基本信息线程结束"); + return firstBookIndexId; + } + return null; + }, threadPoolExecutor); + //加载随机推荐小说线程，该线程在加载小说基本信息线程执行完毕后才执行 + CompletableFuture> recBookCompletableFuture = bookCompletableFuture.thenApplyAsync((book) -> { + List books = bookService.listRecBookByCatId(book.getCatId()); + log.debug("加载随机推荐小说线程结束"); + return books; + }, threadPoolExecutor); + + + model.addAttribute("book", bookCompletableFuture.get()); + model.addAttribute("firstBookIndexId", firstBookIndexIdCompletableFuture.get()); + model.addAttribute("recBooks", recBookCompletableFuture.get()); + model.addAttribute("bookCommentPageBean", bookCommentPageBeanCompletableFuture.get()); + return ThreadLocalUtil.getTemplateDir() + "book/book_detail"; } @@ -136,8 +167,6 @@ public class PageController extends BaseController { @SneakyThrows @RequestMapping("/book/{bookId}/{bookIndexId}.html") public String indexList(@PathVariable("bookId") Long bookId, @PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request, Model model) { - - //加载小说基本信息线程 CompletableFuture bookCompletableFuture = CompletableFuture.supplyAsync(() -> { //查询书籍 diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java index 56a23ce..5b1e3c4 100644 --- a/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java +++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java @@ -1,6 +1,8 @@ package com.java2nb.novel.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.java2nb.novel.core.serialize.CommentUserNameSerialize; import com.java2nb.novel.entity.BookComment; import lombok.Data; @@ -13,6 +15,7 @@ import java.util.Date; @Data public class BookCommentVO extends BookComment { + @JsonSerialize(using = CommentUserNameSerialize.class) private String createUserName; private String createUserPhoto; diff --git a/novel-front/src/main/resources/templates/book/book_detail.html b/novel-front/src/main/resources/templates/book/book_detail.html index 28a92ca..409c80b 100644 --- a/novel-front/src/main/resources/templates/book/book_detail.html +++ b/novel-front/src/main/resources/templates/book/book_detail.html @@ -86,20 +86,21 @@
-

作品评论区

(0条) +

作品评论区

发表评论
-