tj

RuoYi-Vue/ruoyi-admin/src/main/resources/application.yml

@@ -208,4 +208,7 @@ permit-all:
     - /webjars/**
 
 cors:
-  allowed-origins: http://localhost:9090
+  allowed-origins: http://localhost:9090
+
+novel:
+  amountDay: 900

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/controller/NovelController.java

@@ -51,11 +51,13 @@ public class NovelController extends BaseController {
     // 添加所有缺失方法
 
     @GetMapping("/hot")
-    public List<Novel> getHotNovels() {
+    public TableDataInfo getHotNovels() {
+        //startPage();
         List<Novel> hotNovels = novelService.getHotNovels();
         //return novelService.getHotNovels();
         // 返回统一格式 { code, msg, data }
-        return (List<Novel>) AjaxResult.success(hotNovels);
+        return getDataTable(hotNovels);
+        //return (List<Novel>) AjaxResult.success(hotNovels);
     }
 
     // 获取分类列表

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/domain/Novel.java

@@ -44,7 +44,7 @@ public class Novel {
     private Long categoryId;
     //@Field(type = FieldType.Keyword)
     @TableField("status")
-    private Integer status = 0; // 0: 连载中, 1: 已完结// 连载/完本
+    private Integer status = 1; // 0: 连载中, 1: 已完结// 连载/完本
     //@Field(type = FieldType.Text, analyzer = "ik_smart")
     // 添加其他在 XML 中使用的字段
     @TableField(exist = false)

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/mapper/CategoryMapper.java

@@ -1,12 +1,15 @@
 package com.ruoyi.novel.mapper;
 
+import com.ruoyi.novel.domain.NovelCategory;
 import jdk.jfr.Category;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 // CategoryMapper.java
 @Mapper
 public interface CategoryMapper {
-    List<Category> selectCategoryList();
+    List<NovelCategory> selectCategoryList();
+    NovelCategory selectById(@Param("categoryId") String categoryId);
 }

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/NovelService.java

@@ -1,14 +1,10 @@
 package com.ruoyi.novel.service;
 
-import com.ruoyi.novel.domain.AuthorApplication;
-import com.ruoyi.novel.domain.AuthorApplicationDTO;
-import com.ruoyi.novel.domain.Chapter;
-import com.ruoyi.novel.domain.Novel;
+import com.ruoyi.novel.domain.*;
 //import com.ruoyi.novel.repository.elastic.NovelSearchRepository;
 import com.ruoyi.novel.repository.jpa.NovelRepository;
 import jdk.jfr.Category;
 //import org.elasticsearch.client.tasks.ElasticsearchException;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,9 +31,9 @@ public interface NovelService {
     void rejectAuthorApplication(Long applicationId);
 
     // 添加所有缺失方法声明
-    List<Category> getAllCategories();
+    List<NovelCategory> getAllCategories();
     List<Novel> getHotNovels();
-    List<Novel> getNovelsByCategory(Long categoryId);
+    NovelCategory getNovelsByCategory(Long categoryId);
     List<Chapter> getChaptersByNovelId(Long novelId);
     Chapter getChapterContent(Long chapterId);
     void submitAuthorApplication(AuthorApplicationDTO dto, Long userId);

RuoYi-Vue/ruoyi-system/src/main/java/com/ruoyi/novel/service/impl/NovelServiceImpl.java

@@ -22,6 +22,7 @@ import jdk.jfr.Category;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,7 +38,8 @@ public class NovelServiceImpl implements NovelService {
     private static final Logger logger = LoggerFactory.getLogger(NovelServiceImpl.class);
     private final NovelRepository novelRepository; // JPA
 
-
+    @Value("${novel.amountDay}")
+    private Integer amountDay;
     //private final NovelSearchRepository novelSearchRepository; // ES
 
     @Autowired
@@ -252,7 +254,7 @@ public class NovelServiceImpl implements NovelService {
 
 
     @Override
-    public List<Category> getAllCategories() {
+    public List<NovelCategory> getAllCategories() {
 
         return categoryMapper.selectCategoryList();
     }
@@ -261,22 +263,18 @@ public class NovelServiceImpl implements NovelService {
     public List<Novel> getHotNovels() {
         // 获取最近一周热门小说
         Map<String, Object> params = new HashMap<>();
-        params.put("beginTime", DateUtils.addDays(new Date(), -7));
+        params.put("beginTime", DateUtils.addDays(new Date(), -amountDay));
         return novelMapper.selectHotNovels(params);
     }
 
     @Override
-    public List<Novel> getNovelsByCategory(Long categoryId) {
-        // 使用若依分页工具
-        startPage();
-
+    public NovelCategory getNovelsByCategory(Long categoryId) {
         Novel novel = new Novel();
         if (categoryId != null && categoryId > 0) {
             novel.setCategoryId(categoryId);
         }
-
-        List<Novel> list = novelMapper.selectNovelList(novel,null);
-        return (List<Novel>) getDataTable(list);
+        NovelCategory novelCategory = categoryMapper.selectById(categoryId.toString());
+        return novelCategory;
     }
 
     @Override

RuoYi-Vue/ruoyi-system/src/main/resources/mapper/novel/ChapterMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.novel.mapper.CategoryMapper">
+
+    <resultMap id="NovelCategoryResult" type="NovelCategory">
+        <id property="id" column="id" />
+        <result property="title" column="title" />
+        <result property="pid" column="pid" />
+        <result property="sort" column="sort" />
+        <!-- 其他字段映射 -->
+    </resultMap>
+
+    <select id="selectCategoryList" resultMap="NovelCategoryResult">
+        SELECT id, title, pid, sort
+        FROM novel_category
+        WHERE status = 1
+        ORDER BY sort ASC
+    </select>
+
+    <select id="selectById" parameterType="String" resultMap="NovelCategoryResult">
+        SELECT id, title, pid, sort
+        FROM novel_category
+        WHERE id = #{categoryId}
+    </select>
+</mapper>