tj

RuoYi-Vue/ruoyi-novel/pom.xml

@@ -52,6 +52,12 @@
             <artifactId>mybatis-plus-annotation</artifactId>
             <version>3.4.1</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.4.0-jre</version> <!-- 使用较新版本 -->
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -16,7 +16,11 @@ public class ChapterController {
 
     @Autowired
     private ChapterService chapterService;
-
+    @GetMapping("/list/{novelId}")
+    public AjaxResult listChapters(@PathVariable Long novelId) {
+        List<NovelChapter> chapters = chapterService.selectChapterListByNovelId(novelId);
+        return AjaxResult.success(chapters);
+    }
     @GetMapping("/{novelId}")
     public AjaxResult getChapters(@PathVariable Long novelId) {
         List<NovelChapter> chapters = chapterService.selectChapterListByNovelId(novelId);

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.novel.domain.AdCountRequest;
 import com.ruoyi.novel.service.AdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -70,7 +71,7 @@ public class NovelAdController {
 
         // 其次使用请求中的用户ID
         if (request.getUserId() != null) {
-            return request.getUserId();
+            return request.getUserId().toString();
         }
 
         // 最后使用设备ID

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

@@ -1,8 +1,14 @@
 package com.ruoyi.novel.controller;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
 import com.ruoyi.common.core.domain.AjaxResult;
+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.service.NovelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,6 +33,24 @@ public class NovelController {
     public AjaxResult add(@RequestBody Novel novel) {
         return toAjax(novelService.insertNovel(novel));
     }
+    private AjaxResult toAjax(int rows) {
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+    }
+    // 若依框架的分页方法
+    protected void startPage() {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        PageHelper.startPage(pageNum, pageSize);
+    }
 
+    // 若依框架的表格数据封装
+    protected TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
     // 其他接口...
 }

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

@@ -1,6 +1,6 @@
 package com.ruoyi.novel.controller;
 
-import com.ruoyi.common.annotation.RateLimiter;
+import com.google.common.util.concurrent.RateLimiter;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.novel.domain.VoteRequest;
 import com.ruoyi.novel.service.IVoteService;

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

@@ -1,6 +1,7 @@
 package com.ruoyi.novel.controller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.novel.domain.ReadingRecord;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -10,6 +11,7 @@ public class ReadingHistoryController {
     @PostMapping("/record")
     public AjaxResult recordReading(@RequestBody ReadingRecord record) {
         // 记录用户阅读位置
+        return null;
     }
 
     @GetMapping("/last/{userId}/{novelId}")
@@ -17,5 +19,6 @@ public class ReadingHistoryController {
             @PathVariable Long userId,
             @PathVariable Long novelId) {
         // 获取最后阅读位置
+        return null;
     }
 }

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

@@ -19,4 +19,9 @@ public class AdCountRequest {
 
     @NotBlank(message = "设备ID不能为空")
     private String deviceId;
+
+    public String source;
+
+    public String adType;
+
 }

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

@@ -35,4 +35,6 @@ public class AdLog {
 
     // 确保有默认构造方法
     public AdLog() {}
+
+    public String deviceId;
 }

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

@@ -13,4 +13,8 @@ public class NovelChapter {
     private Integer chapterOrder;
     private Date publishTime;
     private String isVip;
+
+    public Date createTime;
+
+    public Date updateTime;
 }

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

@@ -0,0 +1,21 @@
+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;
+
+@Data
+@TableName("reading_history")
+public class ReadingRecord {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long userId;
+    private Long chapterId;
+    private Long novelId;
+    private Integer progress;
+    private Long position;
+    private Date lastReadTime;
+}

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

@@ -20,4 +20,7 @@ public class RoyaltySummary {
 
     private BigDecimal totalReads;
     private Date lastSyncTime;
+
+    public RoyaltySummary(long l, String s, BigDecimal bigDecimal) {
+    }
 }

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

@@ -1,5 +1,9 @@
 package com.ruoyi.novel.domain;
 
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
 // VoteRequest.java
 @Data
 public class VoteRequest {

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

@@ -0,0 +1,8 @@
+package com.ruoyi.novel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.novel.domain.AdPlatformConfig;
+
+public interface AdPlatformConfigMapper extends BaseMapper<AdPlatformConfig> {
+    // 继承BaseMapper即拥有selectList/insert等方法
+}

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

@@ -1,5 +1,6 @@
 package com.ruoyi.novel.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.novel.domain.NovelChapter;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,4 +13,14 @@ public interface NovelChapterMapper {
     NovelChapter selectChapterById(Long chapterId);
     int insertChapter(NovelChapter chapter);
     int updateChapter(NovelChapter chapter);
+
+    List<NovelChapter> selectList(QueryWrapper<NovelChapter> orderByAsc);
+
+    void insert(NovelChapter chapter);
+
+    void updateById(NovelChapter chapter);
+
+    NovelChapter selectById(Long chapterId);
+
+    int deleteBatchIds(List<Long> asList);
 }

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

@@ -0,0 +1,14 @@
+package com.ruoyi.novel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.novel.domain.NovelContent;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
+
+@Mapper
+public interface NovelContentMapper extends BaseMapper<NovelContent> {
+    // 特殊方法可在此定义
+    @Update("UPDATE novel_content SET content = #{content} WHERE chapter_id = #{chapterId}")
+    int updateContent(@Param("chapterId") Long chapterId, @Param("content") String content);
+}

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

@@ -1,4 +1,9 @@
 package com.ruoyi.novel.mapper;
+
+import com.ruoyi.novel.domain.Novel;
+
+import java.util.List;
+
 // NovelMapper.java
 public interface NovelMapper {
     List<Novel> selectNovelList(Novel novel);

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

@@ -0,0 +1,10 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.AdPlatformConfig;
+
+public interface AdConfigService {
+
+    void refreshConfigCache();
+
+    AdPlatformConfig getConfig(String adPlatform);
+}

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

@@ -0,0 +1,9 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.AdLog;
+import org.springframework.transaction.annotation.Transactional;
+
+public interface AdLogService {
+    @Transactional
+    void logAdView(AdLog adLog);
+}

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

@@ -1,5 +1,6 @@
 package com.ruoyi.novel.service;
 
+import com.ruoyi.novel.domain.AdCountRequest;
 import com.ruoyi.novel.domain.AdLog;
 import org.springframework.stereotype.Service;
 
@@ -7,6 +8,8 @@ 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/AdSyncService.java

@@ -0,0 +1,10 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.AdLog;
+import com.ruoyi.novel.domain.AdPlatformConfig;
+
+public interface AdSyncService {
+    void syncToTencent(AdLog adLog, AdPlatformConfig config);
+
+    void syncToPangle(AdLog adLog, AdPlatformConfig config);
+}

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

@@ -1,14 +1,21 @@
 package com.ruoyi.novel.service;
 
+import com.ruoyi.novel.domain.AdCountRequest;
 import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.AdPlatformConfig;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 @Service
 public interface IAdService {
     void logAdView(AdLog adLog);
+
+    void logAdView(AdCountRequest request);
+
+    List<AdLog> getAdLogsByUser(Long userId);
+
     void syncWithAdPlatform(AdLog adLog);
     void retryFailedSyncs();
     Map<String, AdPlatformConfig> loadAdConfigs();

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

@@ -9,4 +9,8 @@ public interface IVoteService {
     void generateStoryContent(VoteRecord record);
     void notifyPhpSystem(VoteRecord record);
     void retryFailedNotifications();
+
+    void notifyPhpSystem(VoteRequest request, String generatedContent);
+
+    String generateStoryContent(Long storyId, Long optionId);
 }

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

@@ -1,4 +1,4 @@
 package com.ruoyi.novel.service;
 
-public class NovelSearchService {
+public interface NovelSearchService {
 }

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

@@ -0,0 +1,13 @@
+package com.ruoyi.novel.service;
+
+import com.ruoyi.novel.domain.Novel;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+public interface NovelService {
+    List<Novel> selectNovelList(Novel novel);
+
+    @Transactional
+    int insertNovel(Novel novel);
+}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.novel.service.impl;
 
 import com.ruoyi.novel.domain.AdPlatformConfig;
+import com.ruoyi.novel.mapper.AdPlatformConfigMapper;
+import com.ruoyi.novel.service.AdConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -5,7 +5,12 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.AdPlatformConfig;
 import com.ruoyi.novel.mapper.AdLogMapper;
+import com.ruoyi.novel.service.AdConfigService;
+import com.ruoyi.novel.service.AdLogService;
+import com.ruoyi.novel.service.AdSyncService;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -18,6 +23,7 @@ import java.util.List;
 @Service
 @Slf4j
 public class AdLogServiceImpl implements AdLogService {
+    private static final Logger logger = LoggerFactory.getLogger(AdLogServiceImpl.class);
 
     @Autowired
     private AdLogMapper adLogMapper;
@@ -75,7 +81,7 @@ public class AdLogServiceImpl implements AdLogService {
         );
 
         failedLogs.forEach(log -> {
-            log.info("重试广告同步: ID={}, 平台={}", log.getId(), log.getAdPlatform());
+            logger.info("重试广告同步: ID={}, 平台={}", log.getId(), log.getAdPlatform());
             syncAdLogAsync(log);
         });
     }

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

@@ -1,7 +1,6 @@
 package com.ruoyi.novel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.novel.config.ScheduledTasks;
 import com.ruoyi.novel.domain.AdCountRequest;
 import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.AdPlatformConfig;
@@ -46,18 +45,18 @@ public class AdServiceImpl implements IAdService {
         adLogMapper.insert(adLog);
     }
 
-    @Override
-    @Async("adTaskExecutor")
-    public void syncWithAdPlatform(AdLog adLog) {
-        try {
-            adPlatformClient.syncAdPlatform(adLog);
-            adLog.setSyncStatus(1); // 同步成功
-        } catch (Exception e) {
-            logger.error("Ad sync failed: {}", e.getMessage());
-            adLog.setSyncStatus(2); // 同步失败
-        }
-        adLogMapper.updateById(adLog);
-    }
+//    @Override
+//    @Async("adTaskExecutor")
+//    public void syncWithAdPlatform(AdLog adLog) {
+//        try {
+//            adPlatformClient.syncAdPlatform(adLog);
+//            adLog.setSyncStatus(1); // 同步成功
+//        } catch (Exception e) {
+//            logger.error("Ad sync failed: {}", e.getMessage());
+//            adLog.setSyncStatus(2); // 同步失败
+//        }
+//        adLogMapper.updateById(adLog);
+//    }
 
     @Override
     @Scheduled(fixedRateString = "${scheduled.ad-retry-interval:300000}") // 默认5分钟重试
@@ -119,9 +118,11 @@ public class AdServiceImpl implements IAdService {
         switch (adLog.getAdPlatform()) {
             case "tencent":
                 adPlatformClient.syncTencent(adLog);
+                adLog.setSyncStatus(1); // 同步成功
                 break;
             case "pangle":
                 adPlatformClient.syncPangle(adLog);
+                adLog.setSyncStatus(1); // 同步成功
                 break;
             default:
                 logger.warn("Unknown ad platform: {}", adLog.getAdPlatform());

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

@@ -3,6 +3,7 @@ package com.ruoyi.novel.service.impl;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.novel.domain.AdLog;
 import com.ruoyi.novel.domain.AdPlatformConfig;
+import com.ruoyi.novel.service.AdSyncService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;

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

@@ -1,13 +1,17 @@
 package com.ruoyi.novel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.novel.domain.NovelChapter;
 import com.ruoyi.novel.domain.NovelContent;
 import com.ruoyi.novel.mapper.NovelChapterMapper;
+import com.ruoyi.novel.mapper.NovelContentMapper;
 import com.ruoyi.novel.service.ChapterService;
 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;
 
 // ChapterServiceImpl.java

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

@@ -31,8 +31,8 @@ public class FinanceServiceImpl implements IFinanceService {
     @Value("${royalty.rate}")
     private BigDecimal royaltyRate;
 
-    @Value("${handling.fee.rate}")
-    private BigDecimal handlingFeeRate;
+    //@Value("${handling.fee.rate}")
+    //private BigDecimal handlingFeeRate;
 
     @Override
     public RoyaltyReport calculateRoyalty(Long authorId, String month) {

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

@@ -2,6 +2,7 @@ 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;