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 779c6f5..615d152 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 @@ -10,6 +10,7 @@ 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 com.java2nb.novel.vo.BookSettingVO; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -23,6 +24,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; import java.util.List; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ThreadPoolExecutor; @@ -78,9 +80,15 @@ public class PageController extends BaseController { /** * 首页 */ + @SneakyThrows @RequestMapping(path = {"/", "/index", "/index.html"}) public String index(Model model) { - model.addAttribute("bookMap", bookService.listBookSettingVO()); + //加载小说首页小说基本信息线程 + CompletableFuture>> bookCompletableFuture = CompletableFuture.supplyAsync(bookService::listBookSettingVO, threadPoolExecutor); + //加载首页新闻线程 + CompletableFuture> newsCompletableFuture = CompletableFuture.supplyAsync(newsService::listIndexNews, threadPoolExecutor); + model.addAttribute("bookMap", bookCompletableFuture.get()); + model.addAttribute("newsList", newsCompletableFuture.get()); return ThreadLocalUtil.getTemplateDir() + "index"; } diff --git a/novel-front/src/main/resources/templates/index.html b/novel-front/src/main/resources/templates/index.html index 03b7ad1..13547ba 100644 --- a/novel-front/src/main/resources/templates/index.html +++ b/novel-front/src/main/resources/templates/index.html @@ -45,6 +45,8 @@
+
+
@@ -230,33 +232,6 @@ lazyload(); $(function () { - //首页新闻查询 - $.ajax({ - type: "get", - url: "/news/listIndexNews", - data: {}, - dataType: "json", - success: function (data) { - if (data.code == 200) { - var indexNewsList = data.data; - var indexNewsHtml = ""; - for (var i = 0; i < indexNewsList.length; i++) { - var indexNews = indexNewsList[i]; - indexNewsHtml += ("
[" + indexNews.catName + "]" + indexNews.title + "\n" + - "
"); - } - $("#indexNews").html(indexNewsHtml); - } else { - layer.alert(data.msg); - } - - }, - error: function () { - layer.alert('网络异常'); - } - }) - //点击榜单数据查询 $.ajax({