From f5101be5fca04146900a8b66abeba75204a61266 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <773861846@qq.com>
Date: Sat, 14 May 2022 06:24:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(home):=20=E9=A6=96=E9=A1=B5=E5=B0=8F?=
 =?UTF-8?q?=E8=AF=B4=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A8=E8=8D=90=E7=B1=BB=E5=9E=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E8=BF=94=E5=9B=9E=E5=B9=B6=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/github/xxyopen/novel/dto/resp/HomeBookRespDto.java   | 5 +++++
 .../github/xxyopen/novel/manager/HomeBookCacheManager.java  | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/xxyopen/novel/dto/resp/HomeBookRespDto.java b/src/main/java/io/github/xxyopen/novel/dto/resp/HomeBookRespDto.java
index 4b54d53..8a98e0b 100644
--- a/src/main/java/io/github/xxyopen/novel/dto/resp/HomeBookRespDto.java
+++ b/src/main/java/io/github/xxyopen/novel/dto/resp/HomeBookRespDto.java
@@ -11,6 +11,11 @@ import lombok.Data;
 @Data
 public class HomeBookRespDto {
 
+    /**
+     * 类型;0-轮播图 1-顶部栏 2-本周强推 3-热门推荐 4-精品推荐
+     */
+    private Integer type;
+
     /**
      * 推荐小说ID
      */
diff --git a/src/main/java/io/github/xxyopen/novel/manager/HomeBookCacheManager.java b/src/main/java/io/github/xxyopen/novel/manager/HomeBookCacheManager.java
index 4cf3b9a..054762e 100644
--- a/src/main/java/io/github/xxyopen/novel/manager/HomeBookCacheManager.java
+++ b/src/main/java/io/github/xxyopen/novel/manager/HomeBookCacheManager.java
@@ -12,7 +12,6 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +39,9 @@ public class HomeBookCacheManager {
             , value = CacheConsts.HOME_BOOK_CACHE_NAME)
     public List<HomeBookRespDto> listHomeBooks() {
         // 从首页小说推荐表中查询出需要推荐的小说
-        List<HomeBook> homeBooks = homeBookMapper.selectList(null);
+        QueryWrapper<HomeBook> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByAsc("sort");
+        List<HomeBook> homeBooks = homeBookMapper.selectList(queryWrapper);
 
         // 获取推荐小说ID列表
         if (!CollectionUtils.isEmpty(homeBooks)) {
@@ -60,6 +61,7 @@ public class HomeBookCacheManager {
                 return homeBooks.stream().map(v -> {
                     BookInfo bookInfo = bookInfoMap.get(v.getBookId());
                     HomeBookRespDto bookRespDto = new HomeBookRespDto();
+                    bookRespDto.setType(v.getType());
                     bookRespDto.setBookId(v.getBookId());
                     bookRespDto.setBookName(bookInfo.getBookName());
                     bookRespDto.setPicUrl(bookInfo.getPicUrl());