修改阅读接口

book-dao/src/main/java/com/book/dao/VO/BookContentVO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 @Data
 public class BookContentVO {
-    String bookId;
-    String contentId;
+    Long userId;
+    Long bookId;
+    Integer contentId;
 }

book-dao/src/main/java/com/book/dao/VO/UserRecentReadVO.java

@@ -0,0 +1,10 @@
+package com.book.dao.VO;
+
+import com.book.dao.cpsshard.entity.UserRecentlyRead;
+import lombok.Data;
+
+@Data
+public class UserRecentReadVO extends UserRecentlyRead {
+    int page;
+    int size;
+}

book-server/src/main/java/com/book/server/controller/BookController.java

@@ -138,14 +138,7 @@ public class BookController extends BaseController {
      */
     @PostMapping("/content")
     public Result<BookContent> getBookContentByChapter(@RequestBody BookContentVO bookContentVO) {
-
-        BookContent content = bookService.getContentByContentId(bookContentVO.getBookId(),
-                bookContentVO.getContentId());
-        if (content == null || "null".equals(content)) {
-            return Result.failure(ResultCode.FAIL.getCode(), "哎呀~没有数据啦~");
-        }
-
-        return Result.byObject(content);
+        return  bookService.getContentByContentId(bookContentVO);
     }
 
     /**
@@ -174,7 +167,7 @@ public class BookController extends BaseController {
      * @return
      */
     @PostMapping("/getRecentReadByUserId")
-    public Result<List<UserRecentlyRead>> getRecentReadByUserId(@RequestBody UserRecentlyRead userRecentlyRead) {
+    public Result<List<UserRecentlyRead>> getRecentReadByUserId(@RequestBody UserRecentReadVO userRecentlyRead) {
         return Result.byObject(bookService.getRecentReadByUserId(userRecentlyRead));
     }
 }

book-server/src/main/java/com/book/server/service/BookService.java

@@ -3,6 +3,7 @@ package com.book.server.service;
 import com.book.dao.VO.*;
 import com.book.dao.cps.pojo.SearchKeyword;
 import com.book.dao.cpsshard.entity.UserRecentlyRead;
+import com.book.server.common.entity.Result;
 
 import java.util.List;
 
@@ -22,9 +23,9 @@ public interface BookService {
 
     List<BookRes> smartRecommand(QueryVO queryVO);
 
-    BookContent getContentByContentId(String bookId,String contentId);
+    Result<BookContent> getContentByContentId(BookContentVO bookContentVO);
 
     UserRecentlyRead getRecentReadByUserIdAndBookId(UserRecentlyRead userRecentlyRead);
 
-    List<UserRecentlyRead> getRecentReadByUserId(UserRecentlyRead userRecentlyRead);
+    List<UserRecentlyRead> getRecentReadByUserId(UserRecentReadVO userRecentlyRead);
 }

book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

@@ -9,6 +9,7 @@ import com.book.dao.cps.pojo.SearchKeyword;
 import com.book.dao.cpsshard.entity.UserRecentlyRead;
 import com.book.dao.cpsshard.mapper.UserRecentlyReadMapper;
 import com.book.dao.cpsshard.pojo.example.UserRecentlyReadExample;
+import com.book.server.common.entity.Result;
 import com.book.server.common.util.JsonUtils;
 import com.book.dao.cps.pojo.example.*;
 import com.book.dao.VO.*;
@@ -277,10 +278,33 @@ public class BookServiceImpl implements BookService {
         return bookRes;
     }
 
+
     @Override
-    public BookContent getContentByContentId(String bookId, String contentId) {
+    public Result<BookContent> getContentByContentId(BookContentVO bookContentVO) {
+        Book book = bookMapper.selectByPrimaryKey(bookContentVO.getBookId());
+        if (book.getFreeChapterNum() == null) {
+
+        }
+        BookContent content = null;
+        if (bookContentVO.getBookId() > 110_0000 && bookContentVO.getBookId() < 110_9999) {
+            // 自定义的书籍 TODO
+        } else {
+            content = getBookContentFromRemote(bookContentVO);
+        }
+        return Result.byObject(content);
+    }
+
+    /**
+     * 获取版权方章节内容
+     *
+     * @param bookContentVO
+     * @return
+     */
+    private BookContent getBookContentFromRemote(BookContentVO bookContentVO) {
+        Long bookId = bookContentVO.getBookId();
+        Integer contentId = bookContentVO.getContentId();
         String contentUrl = "http://new.emeixs.com/index.php/Home/Interface/content/bid/%s/cid/%s";
-        if (StringUtils.isEmpty(bookId) || StringUtils.isEmpty(contentId)) {
+        if (bookId == null || contentId == null) {
             return null;
         }
         BookContent content = null;
@@ -299,8 +323,6 @@ public class BookServiceImpl implements BookService {
             logger.info(e.getMessage());
             return null;
         }
-
-
         return content;
     }
 
@@ -317,13 +339,12 @@ public class BookServiceImpl implements BookService {
     }
 
     @Override
-    public List<UserRecentlyRead> getRecentReadByUserId(UserRecentlyRead userRecentlyRead) {
+    public List<UserRecentlyRead> getRecentReadByUserId(UserRecentReadVO userRecentlyRead) {
         UserRecentlyReadExample example = UserRecentlyReadExample.newAndCreateCriteria()
                 .andUserIdEqualTo(userRecentlyRead.getUserId())
                 .example();
         example.orderBy(UserRecentlyRead.Column.updatetime.desc());
-        //暂定为获取30条
-        example.page(0, 30);
+        example.page(userRecentlyRead.getPage(), userRecentlyRead.getSize());
         return userRecentlyReadMapper.selectByExample(example);
     }