tj

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

@@ -89,6 +89,10 @@ spring:
         max-active: 8
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
+  elasticsearch:
+    uris: http://localhost:9200 # ES地址
+    connection-timeout: 3000
+    socket-timeout: 5000
 # PHP系统配置
 php:
   data:
@@ -147,9 +151,11 @@ mybatis-plus:
   global-config:
     db-config:
       table-prefix: novel_  # 自动为所有实体类添加表前缀:cite[5]:cite[9]
-      id-type: assign_id  # 雪花算法（避免每个实体类单独配@TableId）:cite[5]:cite[9]
+      id-type: auto  # 雪花算法（避免每个实体类单独配@TableId）:cite[5]:cite[9]
   configuration:
+    default-enum-type-handler: org.apache.ibatis.type.EnumTypeHandler
     map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql

RuoYi-Vue/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java

@@ -37,7 +37,15 @@ public final class ServiceException extends RuntimeException
     {
         this.message = message;
     }
+    // 添加支持异常链的构造函数
+    public ServiceException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
+//    public ServiceException(String message, Integer code) {
+//        super(message);
+//        this.code = code;
+//    }
     public ServiceException(String message, Integer code)
     {
         this.message = message;

RuoYi-Vue/ruoyi-novel/pom.xml

@@ -39,12 +39,18 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <!-- Elasticsearch -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
         <!-- MyBatis-Plus 核心依赖 -->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.1</version> <!-- 2023年稳定版，兼容Spring Boot 2.7.x -->
         </dependency>
+        <!-- 长文本处理 -->
 
         <!-- 注解处理器（避免IDE报错） -->
         <dependency>

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/config/MybatisPlusConfig.java

@@ -0,0 +1,16 @@
+package com.ruoyi.novel.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@MapperScan("com.ruoyi.novel.mapper")
+public class MybatisPlusConfig {
+
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
+}

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/config/TableSupport.java

@@ -0,0 +1,21 @@
+package com.ruoyi.novel.config;
+
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.novel.utils.Constants;
+
+public class TableSupport {
+
+    public static PageDomain buildPageRequest() {
+        return getPageDomain();
+    }
+
+    public static PageDomain getPageDomain() {
+        PageDomain pageDomain = new PageDomain();
+        pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGE_NUM));
+        pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE));
+        pageDomain.setOrderByColumn(ServletUtils.getParameter(Constants.ORDER_BY_COLUMN));
+        pageDomain.setIsAsc(ServletUtils.getParameter(Constants.IS_ASC));
+        return pageDomain;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.novel.controller;
 //# 广告计数接口
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.novel.domain.AdCountRequest;
 import com.ruoyi.novel.service.AdService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,11 @@ public class NovelAdController {
 
         return ResponseEntity.ok("Ad counted");
     }
-
+    @PostMapping("/count")
+    public AjaxResult logAdView(@RequestBody AdCountRequest request) {
+        adService.logAdView(request);
+        return AjaxResult.success("广告计数成功");
+    }
     private String resolveUserId(AdCountRequest request, String phpSessionId) {
         // 优先使用PHP会话
         if (phpSessionId != null) {

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

@@ -8,6 +8,8 @@ import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.novel.domain.Novel;
+import com.ruoyi.novel.mapper.NovelMapper;
+import com.ruoyi.novel.service.NovelSearchService;
 import com.ruoyi.novel.service.NovelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,10 @@ public class NovelController {
 
     @Autowired
     private NovelService novelService;
-
+    @Autowired
+    private NovelSearchService searchService;
+    @Autowired
+    private NovelMapper novelMapper;
     @GetMapping("/list")
     public TableDataInfo list(Novel novel) {
         startPage();
@@ -33,6 +38,11 @@ public class NovelController {
     public AjaxResult add(@RequestBody Novel novel) {
         return toAjax(novelService.insertNovel(novel));
     }
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(novelService.deleteNovelByIds(ids));
+    }
+
     private AjaxResult toAjax(int rows) {
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
@@ -53,4 +63,30 @@ public class NovelController {
         return rspData;
     }
     // 其他接口...
+    @GetMapping("/search")
+    public AjaxResult searchNovels(@RequestParam String keyword) {
+        List<Novel> novels = searchService.searchNovels(keyword);
+        return AjaxResult.success(novels);
+    }
+
+    @PostMapping
+    public AjaxResult addNovel(@RequestBody Novel novel) {
+        novelMapper.insert(novel);
+        searchService.indexNovel(novel); // 创建索引
+        return AjaxResult.success();
+    }
+
+    @PutMapping
+    public AjaxResult updateNovel(@RequestBody Novel novel) {
+        novelMapper.updateById(novel);
+        searchService.updateNovelIndex(novel); // 更新索引
+        return AjaxResult.success();
+    }
+
+    @DeleteMapping("/{id}")
+    public AjaxResult deleteNovel(@PathVariable Long id) {
+        novelMapper.deleteById(id);
+        searchService.deleteNovelIndex(id); // 删除索引
+        return AjaxResult.success();
+    }
 }

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

@@ -32,9 +32,12 @@ public class NovelVoteController {
                 request.getUserId(),
                 k -> RateLimiter.create(MAX_VOTES_PER_DAY)
         );
-
+        // 1. 检查用户投票频率
+//        if (!voteService.canUserVote(request.getUserId())) {
+//            return AjaxResult.error("投票过于频繁，请稍后再试");
+//        }
         if (!rateLimiter.tryAcquire()) {
-            return AjaxResult.error("Exceeded daily vote limit");
+            return AjaxResult.error("投票过于频繁，请稍后再试");
         }
 
         // 2. 调用DeepSeek API生成剧情

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

@@ -2,23 +2,27 @@ package com.ruoyi.novel.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.novel.domain.ReadingRecord;
+import com.ruoyi.novel.service.ReadingHistoryService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/history")
 public class ReadingHistoryController {
-
+    @Autowired
+    private ReadingHistoryService historyService;
     @PostMapping("/record")
     public AjaxResult recordReading(@RequestBody ReadingRecord record) {
         // 记录用户阅读位置
-        return null;
+        historyService.recordReading(record);
+        return AjaxResult.success("阅读记录已保存");
     }
 
     @GetMapping("/last/{userId}/{novelId}")
     public AjaxResult getLastPosition(
             @PathVariable Long userId,
             @PathVariable Long novelId) {
-        // 获取最后阅读位置
-        return null;
+        ReadingRecord record = historyService.getLastPosition(userId, novelId);
+        return AjaxResult.success(record);
     }
 }

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

@@ -1,21 +1,39 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.Date;
 
 // Novel.java
 @Data
+@TableName("novel")
+@Document(indexName = "novels")
 public class Novel {
+    @Id
+    @TableId(type = IdType.AUTO)
     private Long id;
+    @Field(type = FieldType.Text, analyzer = "ik_max_word")
     private String title;
+    @Field(type = FieldType.Keyword)
     private String author;
     private String coverImg;
+    @Field(type = FieldType.Long)
     private Long categoryId;
-    private String status;
+    @Field(type = FieldType.Keyword)
+    private String status;// 连载/完本
+    @Field(type = FieldType.Text, analyzer = "ik_smart")
     private String description;
     private Long wordCount;
+    @Field(type = FieldType.Long)
     private Long readCount;
+    @Field(type = FieldType.Date)
     private Date createTime;
     private Date updateTime;
 }

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

@@ -1,12 +1,17 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
 
 // NovelChapter.java
 @Data
+@TableName("novel_chapter")
 public class NovelChapter {
+    @TableId(type = IdType.AUTO)
     private Long id;
     private Long novelId;
     private String chapterTitle;

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

@@ -1,10 +1,14 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 // NovelContent.java
 @Data
+@TableName("novel_content")
 public class NovelContent {
+    @TableId
     private Long chapterId;
     private String content;
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
@@ -12,8 +13,13 @@ import java.util.Date;
 public class ReadingRecord {
     @TableId(type = IdType.AUTO)
     private Long id;
+    @NotNull(message = "用户ID不能为空")
     private Long userId;
+
+    @NotNull(message = "章节ID不能为空")
     private Long chapterId;
+
+    @NotNull(message = "小说ID不能为空")
     private Long novelId;
     private Integer progress;
     private Long position;

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

@@ -10,7 +10,8 @@ import javax.validation.constraints.NotNull;
 
 // StoryOption.java
 @Data
-@TableName("novel_story_option")
+//@TableName("novel_story_option")
+@TableName("story_option")
 public class StoryOption {
     @TableId(type = IdType.AUTO)
     private Long id;

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

@@ -1,5 +1,6 @@
 package com.ruoyi.novel.domain;
 
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
@@ -19,7 +20,6 @@ public class VoteRecord {
     @TableField(fill = FieldFill.INSERT)
     private Date voteTime;
 
-    @Column(typeHandler = LongTextTypeHandler.class)
     private String generatedContent;
 
     private Integer notifyStatus; // 0-未通知 1-已通知

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/exception/GlobalExceptionHandler.java

@@ -0,0 +1,45 @@
+package com.ruoyi.novel.exception;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.novel.service.impl.ReadingHistoryServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+
+// 新增全局异常处理器
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class);
+
+    /**
+     * 业务异常处理
+     */
+    @ExceptionHandler(ServiceException.class)
+    public AjaxResult handleServiceException(ServiceException e) {
+        logger.error(e.getMessage(), e);
+        return AjaxResult.error(e.getMessage());
+    }
+
+    /**
+     * 参数校验异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public AjaxResult handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        return AjaxResult.error(message);
+    }
+
+    /**
+     * 系统异常
+     */
+    @ExceptionHandler(Exception.class)
+    public AjaxResult handleException(Exception e) {
+        logger.error(e.getMessage(), e);
+        return AjaxResult.error("系统繁忙，请稍后再试");
+    }
+}

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

@@ -1,15 +1,32 @@
 package com.ruoyi.novel.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.novel.domain.Novel;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
 // NovelMapper.java
-public interface NovelMapper {
+public interface NovelMapper extends BaseMapper<Novel> {
     List<Novel> selectNovelList(Novel novel);
     Novel selectNovelById(Long id);
     int insertNovel(Novel novel);
     int updateNovel(Novel novel);
     int deleteNovelByIds(Long[] ids);
+
+    // 以下方法已由MyBatis-Plus实现，无需额外代码
+    // int updateById(Novel novel);
+    // int deleteBatchIds(@Param("ids") List<Long> ids);
+    // Novel selectById(Long id);
+
+    // 自定义方法：根据分类ID查询小说
+    @Select("SELECT * FROM novel WHERE category_id = #{categoryId}")
+    List<Novel> selectByCategoryId(Long categoryId);
+
+    // 自定义方法：更新阅读量
+    @Update("UPDATE novel SET read_count = read_count + #{increment} WHERE id = #{id}")
+    int incrementReadCount(@Param("id") Long id, @Param("increment") Long increment);
 }
 

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

@@ -0,0 +1,34 @@
+package com.ruoyi.novel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.novel.domain.ReadingRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+// ReadingHistoryMapper.java
+@Mapper
+public interface ReadingHistoryMapper extends BaseMapper<ReadingRecord> {
+
+    // 根据用户和章节查询记录
+    @Select("SELECT * FROM reading_history " +
+            "WHERE user_id = #{userId} AND chapter_id = #{chapterId}")
+    ReadingRecord selectByUserAndChapter(@Param("userId") Long userId,
+                                         @Param("chapterId") Long chapterId);
+
+    // 获取用户最后阅读位置
+    @Select("SELECT * FROM reading_history " +
+            "WHERE user_id = #{userId} AND novel_id = #{novelId} " +
+            "ORDER BY last_read_time DESC LIMIT 1")
+    ReadingRecord selectLastPosition(@Param("userId") Long userId,
+                                     @Param("novelId") Long novelId);
+
+    // 更新阅读进度
+    @Update("UPDATE reading_history SET " +
+            "progress = #{progress}, " +
+            "position = #{position}, " +
+            "last_read_time = NOW() " +
+            "WHERE id = #{id}")
+    int updateReadingProgress(ReadingRecord record);
+}

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

@@ -0,0 +1,40 @@
+package com.ruoyi.novel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.novel.domain.StoryOption;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+import java.util.List;
+
+// StoryOptionMapper.java
+@Mapper
+public interface StoryOptionMapper extends BaseMapper<StoryOption> {
+
+    // 增加选项投票数
+    @Update("UPDATE story_option SET vote_count = vote_count + 1 WHERE id = #{optionId}")
+    int incrementVoteCount(@Param("optionId") Long optionId);
+
+    // 根据章节ID获取选项
+    @Select("SELECT * FROM story_option WHERE chapter_id = #{chapterId} ORDER BY sort_order")
+    List<StoryOption> selectByChapterId(Long chapterId);
+
+    // 批量更新选项投票数
+    @Update("<script>" +
+            "UPDATE story_option SET vote_count = CASE id " +
+            "<foreach collection='options' item='opt'>" +
+            "WHEN #{opt.id} THEN #{opt.voteCount} " +
+            "</foreach>" +
+            "END WHERE id IN " +
+            "<foreach collection='options' item='opt' open='(' separator=',' close=')'>" +
+            "#{opt.id}" +
+            "</foreach>" +
+            "</script>")
+    int batchUpdateVoteCount(@Param("options") List<StoryOption> options);
+
+    @Update("UPDATE story_option SET vote_count = vote_count + 1 WHERE id = #{optionId}")
+    int incrementOptionVote(@Param("optionId") Long optionId);
+
+}

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

@@ -2,10 +2,8 @@ package com.ruoyi.novel.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.novel.domain.VoteRecord;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import lombok.Data;
+import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
@@ -22,4 +20,27 @@ public interface VoteRecordMapper extends BaseMapper<VoteRecord> {
 
     @Select("SELECT * FROM novel_vote_log WHERE notify_status = 0 ORDER BY vote_time ASC LIMIT 50")
     List<VoteRecord> selectUnnotifiedRecords();
+
+
+    // 插入投票记录（带生成内容）
+    @Insert("INSERT INTO vote_record (user_id, story_id, option_id, vote_time, generated_content) " +
+            "VALUES (#{userId}, #{storyId}, #{optionId}, NOW(), #{generatedContent})")
+    @Options(useGeneratedKeys = true, keyProperty = "id")
+    int insertVoteRecord(VoteRecord record);
+
+    // 获取用户投票记录
+    @Select("SELECT * FROM vote_record WHERE user_id = #{userId} ORDER BY vote_time DESC")
+    List<VoteRecord> selectByUserId(Long userId);
+
+    // 获取故事投票统计
+    @Select("SELECT option_id, COUNT(*) AS vote_count FROM vote_record " +
+            "WHERE story_id = #{storyId} GROUP BY option_id")
+    List<VoteStats> getVoteStatsByStory(Long storyId);
+
+    // 投票统计DTO
+    @Data
+    class VoteStats {
+        private Long optionId;
+        private Integer voteCount;
+    }
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
 @Service
 // AdService.java
 public interface AdService {
-    //void logAdView(AdCountRequest request);
+    void logAdView(AdCountRequest request);
     List<AdLog> getAdLogsByUser(Long userId);
 
     void logAdView(String userId, Long chapterId, String adType, String source);

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

@@ -1,4 +1,13 @@
 package com.ruoyi.novel.service;
 
+import com.ruoyi.novel.domain.Novel;
+
+import java.util.List;
+
+// NovelSearchService.java
 public interface NovelSearchService {
+    List<Novel> searchNovels(String keyword);
+    void indexNovel(Novel novel);
+    void updateNovelIndex(Novel novel);
+    void deleteNovelIndex(Long id);
 }

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

@@ -10,4 +10,7 @@ public interface NovelService {
 
     @Transactional
     int insertNovel(Novel novel);
+    int updateNovel(Novel novel);
+    int deleteNovelByIds(Long[] ids);
+    Novel selectNovelById(Long id);
 }

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

@@ -0,0 +1,9 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.ReadingRecord;
+
+// ReadingHistoryService.java
+public interface ReadingHistoryService {
+    void recordReading(ReadingRecord record);
+    ReadingRecord getLastPosition(Long userId, Long novelId);
+}

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

@@ -0,0 +1,29 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.VoteRecord;
+import com.ruoyi.novel.domain.VoteRequest;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+
+// VoteService.java
+public interface VoteService {
+    String processVote(VoteRequest request);
+
+    String generateStoryContent(Long storyId, Long optionId);
+
+    @Async("voteTaskExecutor")
+    void generateStoryContent(VoteRecord record);
+
+    void notifyPhpSystem(VoteRequest request, String content);
+
+    // 添加方法实现
+    void incrementOptionVote(Long optionId);
+
+    boolean canUserVote(Long userId);
+
+    @Async("voteTaskExecutor")
+    void notifyPhpSystem(VoteRecord record);
+
+    @Scheduled(cron = "0 */10 * * * ?") // 每10分钟执行一次
+    void retryFailedNotifications();
+}

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

@@ -1,20 +1,27 @@
 package com.ruoyi.novel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.RoyaltyReport;
 import com.ruoyi.novel.domain.RoyaltySummary;
+import com.ruoyi.novel.mapper.AdLogMapper;
 import com.ruoyi.novel.mapper.RoyaltySummaryMapper;
+import com.ruoyi.novel.service.IAdService;
 import com.ruoyi.novel.service.IFinanceService;
 
 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.http.*;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 // FinanceServiceImpl.java
@@ -30,6 +37,15 @@ public class FinanceServiceImpl implements IFinanceService {
     private BigDecimal handlingFeeRate;
     @Value("${royalty.rate}")
     private BigDecimal royaltyRate;
+    // 添加配置项注入
+    @Value("${php.data.url}")
+    private String phpDataUrl;
+
+    @Autowired
+    private AdLogMapper adLogMapper; // 确保已注入
+
+    @Autowired
+    private IAdService adService; // 确保已注入
 
     //@Value("${handling.fee.rate}")
     //private BigDecimal handlingFeeRate;
@@ -101,15 +117,60 @@ public class FinanceServiceImpl implements IFinanceService {
         }
     }
 
+//    private List<RoyaltySummary> fetchFromPhpSystem() {
+//        // 实现从PHP系统获取数据的逻辑
+//        // 返回模拟数据
+//        List<RoyaltySummary> list = new ArrayList<>();
+//        list.add(new RoyaltySummary(1001L, "2023-10", new BigDecimal("15000.00")));
+//        list.add(new RoyaltySummary(1002L, "2023-10", new BigDecimal("8500.00")));
+//        return list;
+//    }
+
+    // 在FinanceServiceImpl中补充完整数据同步
     private List<RoyaltySummary> fetchFromPhpSystem() {
-        // 实现从PHP系统获取数据的逻辑
-        // 返回模拟数据
-        List<RoyaltySummary> list = new ArrayList<>();
-        list.add(new RoyaltySummary(1001L, "2023-10", new BigDecimal("15000.00")));
-        list.add(new RoyaltySummary(1002L, "2023-10", new BigDecimal("8500.00")));
-        return list;
+        try {
+            // 使用RestTemplate从PHP系统获取数据
+            RestTemplate restTemplate = new RestTemplate();
+
+            // 设置认证头
+            HttpHeaders headers = new HttpHeaders();
+            headers.setBasicAuth("api_user", "api_password");
+
+            // 构建请求
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+            ResponseEntity<RoyaltySummary[]> response = restTemplate.exchange(
+                    phpDataUrl + "/royalty/summary",
+                    HttpMethod.GET,
+                    entity,
+                    RoyaltySummary[].class
+            );
+
+            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
+                return Arrays.asList(response.getBody());
+            }
+            throw new ServiceException("PHP系统返回错误状态码: " + response.getStatusCode());
+        } catch (Exception e) {
+            logger.error("从PHP系统获取分账数据失败: {}", e.getMessage());
+            throw new ServiceException("数据同步服务暂时不可用", e);
+        }
     }
 
+    // 定时任务重试机制
+    @Scheduled(fixedDelayString = "${scheduled.ad-retry-interval}")
+    public void retryFailedAdSync() {
+        try {
+            List<AdLog> failedLogs = adLogMapper.selectList(
+                    new QueryWrapper<AdLog>().eq("sync_status", 2) // 2=失败
+            );
+
+            for (AdLog log : failedLogs) {
+                logger.info("重试广告同步: ID={}, 平台={}", log.getId(), log.getAdPlatform());
+                adService.syncWithAdPlatform(log);
+            }
+        } catch (Exception e) {
+            logger.error("广告同步重试任务失败: {}", e.getMessage());
+        }
+    }
     @Override
     public BigDecimal getRoyaltyRate(Long authorId) {
         // 实际应根据作者等级计算

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

@@ -1,23 +1,103 @@
 package com.ruoyi.novel.service.impl;
 
 import com.ruoyi.novel.domain.Novel;
+import com.ruoyi.novel.mapper.NovelMapper;
 import com.ruoyi.novel.service.NovelSearchService;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.IndexOperations;
+import org.springframework.data.elasticsearch.core.SearchHit;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.document.Document;
+import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
+import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 // NovelSearchService.java
 @Service
 public class NovelSearchServiceImpl implements NovelSearchService {
+    private static final Logger logger = LoggerFactory.getLogger(NovelSearchServiceImpl.class);
 
     @Autowired
     private ElasticsearchRestTemplate elasticTemplate;
+    @Autowired
+    private NovelMapper novelMapper;
+
+    private static final String INDEX_NAME = "novels";
 
+    @PostConstruct
+    public void createIndexIfNotExists() {
+        IndexOperations indexOps = elasticTemplate.indexOps(IndexCoordinates.of(INDEX_NAME));
+        if (!indexOps.exists()) {
+            // 创建索引
+            indexOps.create();
+
+            // 创建映射
+            Document mapping = indexOps.createMapping(Novel.class);
+            indexOps.putMapping(mapping);
+        }
+//        if (!elasticTemplate.indexExists(INDEX_NAME)) {
+//            elasticTemplate.createIndex(INDEX_NAME);
+//            elasticTemplate.putMapping(Novel.class);
+//        }
+    }
     public List<Novel> searchNovels(String keyword) {
+        // 构建查询条件
         NativeSearchQuery query = new NativeSearchQueryBuilder()
                 .withQuery(QueryBuilders.multiMatchQuery(keyword, "title", "author", "description"))
                 .build();
-        return elasticTemplate.search(query, Novel.class).getContent();
+        // 执行搜索
+        SearchHits<Novel> hits = elasticTemplate.search(query, Novel.class);
+        return hits.stream()
+                .map(SearchHit::getContent)
+                .collect(Collectors.toList());
+
+        //return elasticTemplate.search(query, Novel.class).getContent();
+    }
+
+    @Override
+    public void indexNovel(Novel novel) {
+        IndexQuery indexQuery = new IndexQueryBuilder()
+                .withId(novel.getId().toString())
+                .withObject(novel)
+                .build();
+        elasticTemplate.index(indexQuery, IndexCoordinates.of(INDEX_NAME));
+    }
+    @Override
+    public void updateNovelIndex(Novel novel) {
+        UpdateQuery updateQuery = UpdateQuery.builder(novel.getId().toString())
+                .withDocument(Document.from(convertNovelToMap(novel)))
+                .build();
+        elasticTemplate.update(updateQuery, IndexCoordinates.of(INDEX_NAME));
+    }
+    private Map<String, Object> convertNovelToMap(Novel novel) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("title", novel.getTitle());
+        map.put("author", novel.getAuthor());
+        map.put("description", novel.getDescription());
+        map.put("categoryId", novel.getCategoryId());
+        map.put("status", novel.getStatus());
+        return map;
+    }
+    @Override
+    public void deleteNovelIndex(Long id) {
+        elasticTemplate.delete(id.toString(), IndexCoordinates.of(INDEX_NAME));
+    }
+    // 定时同步数据库数据到ES
+    @Scheduled(fixedRate = 3600000) // 每小时同步一次
+    public void syncDataToEs() {
+        List<Novel> novels = novelMapper.selectList(null);
+        novels.forEach(this::indexNovel);
+        logger.info("同步 {} 条小说数据到ES", novels.size());
     }
 }

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

@@ -3,16 +3,20 @@ package com.ruoyi.novel.service.impl;
 import com.ruoyi.novel.domain.Novel;
 import com.ruoyi.novel.mapper.NovelMapper;
 import com.ruoyi.novel.service.NovelService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
 // NovelServiceImpl.java
 @Service
 public class NovelServiceImpl implements NovelService {
+    private static final Logger logger = LoggerFactory.getLogger(NovelServiceImpl.class);
 
     @Autowired
     private NovelMapper novelMapper;
@@ -29,5 +33,21 @@ public class NovelServiceImpl implements NovelService {
         return novelMapper.insertNovel(novel);
     }
 
+    @Override
+    public int updateNovel(Novel novel) {
+        novel.setUpdateTime(new Date());
+        return novelMapper.updateById(novel);
+    }
+
+    @Override
+    public int deleteNovelByIds(Long[] ids) {
+        return novelMapper.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public Novel selectNovelById(Long id) {
+        return novelMapper.selectById(id);
+    }
+
     // 其他CRUD方法...
 }

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

@@ -0,0 +1,60 @@
+package com.ruoyi.novel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.novel.domain.ReadingRecord;
+import com.ruoyi.novel.mapper.ReadingHistoryMapper;
+import com.ruoyi.novel.service.ReadingHistoryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+// ReadingHistoryServiceImpl.java
+@Service
+public class ReadingHistoryServiceImpl implements ReadingHistoryService {
+    private static final Logger logger = LoggerFactory.getLogger(ReadingHistoryServiceImpl.class);
+
+    @Autowired
+    private ReadingHistoryMapper historyMapper;
+
+    @Override
+    @Transactional
+    public void recordReading(ReadingRecord record) {
+        record.setLastReadTime(new Date());
+
+        // 检查是否已存在记录
+        ReadingRecord existing = historyMapper.selectOne(
+                new QueryWrapper<ReadingRecord>()
+                        .eq("user_id", record.getUserId())
+                        .eq("chapter_id", record.getChapterId())
+        );
+
+        if (existing != null) {
+            // 更新现有记录
+            existing.setProgress(record.getProgress());
+            existing.setPosition(record.getPosition());
+            existing.setLastReadTime(record.getLastReadTime());
+            historyMapper.updateById(existing);
+        } else {
+            // 插入新记录
+            historyMapper.insert(record);
+        }
+    }
+
+
+
+
+    @Override
+    public ReadingRecord getLastPosition(Long userId, Long novelId) {
+        return historyMapper.selectOne(
+                new QueryWrapper<ReadingRecord>()
+                        .eq("user_id", userId)
+                        .eq("novel_id", novelId)
+                        .orderByDesc("last_read_time")
+                        .last("LIMIT 1")
+        );
+    }
+}

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

@@ -1,18 +1,34 @@
 package com.ruoyi.novel.service.impl;
 
+import com.google.common.util.concurrent.RateLimiter;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.novel.domain.VoteRecord;
 import com.ruoyi.novel.domain.VoteRequest;
+import com.ruoyi.novel.mapper.StoryOptionMapper;
+import com.ruoyi.novel.mapper.VoteRecordMapper;
+import com.ruoyi.novel.service.VoteService;
+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.http.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 // VoteServiceImpl.java
 @Service
-public class VoteServiceImpl implements IVoteService {
+public class VoteServiceImpl implements VoteService {
+    private static final Logger logger = LoggerFactory.getLogger(VoteServiceImpl.class);
 
     @Autowired
     private VoteRecordMapper voteRecordMapper;
@@ -20,13 +36,38 @@ public class VoteServiceImpl implements IVoteService {
     private StoryOptionMapper storyOptionMapper;
     @Value("${deepseek.api.key}")
     private String deepSeekApiKey;
-
+    @Value("${deepseek.api.url}")
+    private String deepSeekApiUrl; // 添加配置项注入
     @Value("${php.notify.url}")
     private String phpNotifyUrl;
+    @Autowired
+    private RestTemplate restTemplate; // 确保已注入
+
+    // 使用Guava RateLimiter实现限流
+    private static final ConcurrentHashMap<Long, RateLimiter> userRateLimiters = new ConcurrentHashMap<>();
+
     // 用户投票限流器 <userId, 计数器>
     private final Map<Long, AtomicInteger> userVoteCounters = new ConcurrentHashMap<>();
     private static final int DAILY_VOTE_LIMIT = 3;
 
+    // 添加方法实现
+    @Override
+    public void incrementOptionVote(Long optionId) {
+        storyOptionMapper.incrementVoteCount(optionId);
+    }
+    @Override
+    public boolean canUserVote(Long userId) {
+        RateLimiter rateLimiter = userRateLimiters.computeIfAbsent(
+                userId, k -> RateLimiter.create(3.0) // 每秒3次
+        );
+        return rateLimiter.tryAcquire();
+    }
+
+    @Override
+    public String generateStoryContent(Long storyId, Long optionId) {
+        // 实际应调用AI服务
+        return "生成的故事内容...";
+    }
     @Override
     public String processVote(VoteRequest request) {
         // 1. 检查当日投票次数
@@ -67,13 +108,40 @@ public class VoteServiceImpl implements IVoteService {
             // 通知PHP系统
             this.notifyPhpSystem(record);
         } catch (Exception e) {
-            log.error("AI生成失败: {}", e.getMessage());
+            logger.error("AI生成失败: {}", e.getMessage());
         }
     }
+    // 在VoteServiceImpl中补充完整API调用
     private String callDeepSeekApi(VoteRecord record) {
-        // 实现DeepSeek API调用
-        // 返回生成的剧情内容
-        return "生成的故事内容...";
+        try {
+            // 构建请求体
+            Map<String, Object> requestBody = new HashMap<>();
+            requestBody.put("story_id", record.getStoryId());
+            requestBody.put("option_id", record.getOptionId());
+            requestBody.put("user_id", record.getUserId());
+
+            // 设置请求头
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.setBearerAuth(deepSeekApiKey);
+
+            // 发送请求
+            HttpEntity<Map<String, Object>> entity = new HttpEntity<>(requestBody, headers);
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    deepSeekApiUrl, HttpMethod.POST, entity, Map.class);
+
+            // 解析响应
+            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
+                Map<String, Object> body = response.getBody();
+                if (body.containsKey("data") && ((Map)body.get("data")).containsKey("content")) {
+                    return (String) ((Map)body.get("data")).get("content");
+                }
+            }
+            throw new ServiceException("DeepSeek API响应格式错误");
+        } catch (RestClientException e) {
+            logger.error("DeepSeek API调用失败: {}", e.getMessage());
+            throw new ServiceException("AI服务暂时不可用", e);
+        }
     }
 
 //    @Async
@@ -97,6 +165,7 @@ public class VoteServiceImpl implements IVoteService {
 //        throw new ServiceException("Failed to generate story content");
 //    }
 
+
     @Async
     @Override
     public void notifyPhpSystem(VoteRequest request, String content) {
@@ -121,6 +190,7 @@ public class VoteServiceImpl implements IVoteService {
         voteRecordMapper.insertVoteRecord(record);
     }
 
+
     @Override
     @Async("voteTaskExecutor")
     public void notifyPhpSystem(VoteRecord record) {
@@ -143,7 +213,7 @@ public class VoteServiceImpl implements IVoteService {
                 record.setNotifyStatus(2); // 通知失败
             }
         } catch (Exception e) {
-            log.error("通知PHP系统失败: {}", e.getMessage());
+            logger.error("通知PHP系统失败: {}", e.getMessage());
             record.setNotifyStatus(2);
         }
         voteRecordMapper.updateById(record);
@@ -154,7 +224,7 @@ public class VoteServiceImpl implements IVoteService {
     public void retryFailedNotifications() {
         List<VoteRecord> failedRecords = voteRecordMapper.selectUnnotifiedRecords();
         failedRecords.forEach(record -> {
-            log.info("重试通知PHP系统: voteId={}", record.getId());
+            logger.info("重试通知PHP系统: voteId={}", record.getId());
             this.notifyPhpSystem(record);
         });
     }

RuoYi-Vue/ruoyi-novel/src/main/java/com/ruoyi/novel/utils/Constants.java

@@ -0,0 +1,8 @@
+package com.ruoyi.novel.utils;
+
+public class Constants {
+    public static final String PAGE_NUM = "pageNum";
+    public static final String PAGE_SIZE = "pageSize";
+    public static final String ORDER_BY_COLUMN = "orderByColumn";
+    public static final String IS_ASC = "isAsc";
+}

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

@@ -17,4 +17,10 @@
         SET vote_count = vote_count + 1
         WHERE id = #{optionId}
     </update>
+
+    <update id="updateNotifyStatus">
+        UPDATE novel_vote_log
+        SET notify_status = #{status}
+        WHERE id = #{id}
+    </update>
 </mapper>