diff --git a/novel-admin/src/main/resources/templates/test/order/add.html b/novel-admin/src/main/resources/templates/test/order/add.html
deleted file mode 100644
index df6f6841..00000000
--- a/novel-admin/src/main/resources/templates/test/order/add.html
+++ /dev/null
@@ -1,327 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/novel-admin/src/main/resources/templates/test/order/detail.html b/novel-admin/src/main/resources/templates/test/order/detail.html
deleted file mode 100644
index 33773379..00000000
--- a/novel-admin/src/main/resources/templates/test/order/detail.html
+++ /dev/null
@@ -1,315 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/novel-admin/src/main/resources/templates/test/order/edit.html b/novel-admin/src/main/resources/templates/test/order/edit.html
deleted file mode 100644
index 4cf036a1..00000000
--- a/novel-admin/src/main/resources/templates/test/order/edit.html
+++ /dev/null
@@ -1,323 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/novel-admin/src/main/resources/templates/test/order/order.html b/novel-admin/src/main/resources/templates/test/order/order.html
deleted file mode 100644
index b215a71e..00000000
--- a/novel-admin/src/main/resources/templates/test/order/order.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/novel-common/src/main/java/com/java2nb/novel/core/bean/PageBean.java b/novel-common/src/main/java/com/java2nb/novel/core/bean/PageBean.java
new file mode 100644
index 00000000..f4f837bf
--- /dev/null
+++ b/novel-common/src/main/java/com/java2nb/novel/core/bean/PageBean.java
@@ -0,0 +1,53 @@
+package com.java2nb.novel.core.bean;
+
+import com.github.pagehelper.PageInfo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 封装通用分页数据,接收PageHelper、SpringData等框架的分页数据，转换成通用的PageBean对象
+ * @author xiongxiaoyang
+ * @version 1.0
+ * @since 2021/2/4
+ * @param 分页集合类型
+ */
+@Data
+public class PageBean {
+
+ private Integer pageNum;
+ private Integer pageSize;
+ private Long total;
+ private List list;
+
+
+ /**
+ * 该构造函数用于PageHelper工具进行分页查询的场景
+ * 接收PageHelper分页后的list
+ */
+ public PageBean(List list){
+ PageInfo pageInfo = new PageInfo<>(list);
+ this.pageNum = pageInfo.getPageNum();
+ this.pageSize = pageInfo.getPageSize();
+ this.total = pageInfo.getTotal();
+ this.list = pageInfo.getList();
+
+ }
+
+ /**
+ * 该构造函数用于通用分页查询的场景
+ * 接收普通分页数据和普通集合
+ */
+ public PageBean(Integer pageNum, Integer pageSize, Long total, List list) {
+ this.pageNum = pageNum;
+ this.pageSize = pageSize;
+ this.total = total;
+ this.list = list;
+ }
+
+
+ //TODO 使用其他的分页工具或框架进行分页查询的场景
+
+
+
+}
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java b/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java
index fe0f8d85..9043e591 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java
@@ -39,8 +39,7 @@ public ResultBean addCrawlSource(CrawlSource source){
@GetMapping("listCrawlByPage")
public ResultBean listCrawlByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
- return ResultBean.ok(new PageInfo<>(BeanUtil.copyList(crawlService.listCrawlByPage(page,pageSize), CrawlSourceVO.class)
- ));
+ return ResultBean.ok(crawlService.listCrawlByPage(page,pageSize));
}
/**
@@ -71,8 +70,7 @@ public ResultBean addCrawlSingleTask(CrawlSingleTask singleTask){
@GetMapping("listCrawlSingleTaskByPage")
public ResultBean listCrawlSingleTaskByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
- return ResultBean.ok(new PageInfo<>(BeanUtil.copyList(crawlService.listCrawlSingleTaskByPage(page,pageSize), CrawlSingleTaskVO.class)
- ));
+ return ResultBean.ok(crawlService.listCrawlSingleTaskByPage(page,pageSize));
}
/**
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java b/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java
index 7c465a72..f4878d65 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java
@@ -1,8 +1,11 @@
package com.java2nb.novel.service;
+import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.crawl.RuleBean;
import com.java2nb.novel.entity.CrawlSingleTask;
import com.java2nb.novel.entity.CrawlSource;
+import com.java2nb.novel.vo.CrawlSourceVO;
import java.util.List;
@@ -22,9 +25,9 @@ public interface CrawlService {
* 爬虫源分页列表
* @param page 当前页码
* @param pageSize 分页大小
- *@return 爬虫源集合
+ *@return 爬虫源分页数据
* */
- List listCrawlByPage(int page, int pageSize);
+ PageBean listCrawlByPage(int page, int pageSize);
/**
* 开启或停止爬虫
@@ -83,9 +86,9 @@ public interface CrawlService {
* 单本采集任务分页列表查询
* @param page 当前页码
* @param pageSize 分页大小
- * @return 单本采集任务集合
+ * @return 单本采集任务分页数据
* */
- List listCrawlSingleTaskByPage(int page, int pageSize);
+ PageBean listCrawlSingleTaskByPage(int page, int pageSize);
/**
* 删除采集任务
diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
index efcfee0a..3a757d57 100644
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
@@ -1,13 +1,17 @@
package com.java2nb.novel.service.impl;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.cache.CacheKey;
import com.java2nb.novel.core.cache.CacheService;
import com.java2nb.novel.core.crawl.CrawlParser;
import com.java2nb.novel.core.crawl.RuleBean;
import com.java2nb.novel.core.enums.ResponseStatus;
import com.java2nb.novel.core.exception.BusinessException;
+import com.java2nb.novel.core.utils.BeanUtil;
import com.java2nb.novel.core.utils.IdWorker;
import com.java2nb.novel.core.utils.SpringUtil;
import com.java2nb.novel.core.utils.ThreadUtil;
@@ -16,6 +20,8 @@
import com.java2nb.novel.mapper.*;
import com.java2nb.novel.service.BookService;
import com.java2nb.novel.service.CrawlService;
+import com.java2nb.novel.vo.CrawlSingleTaskVO;
+import com.java2nb.novel.vo.CrawlSourceVO;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
@@ -66,14 +72,17 @@ public void addCrawlSource(CrawlSource source) {
}
@Override
- public List listCrawlByPage(int page, int pageSize) {
+ public PageBean listCrawlByPage(int page, int pageSize) {
PageHelper.startPage(page, pageSize);
SelectStatementProvider render = select(id, sourceName, sourceStatus, createTime, updateTime)
.from(crawlSource)
.orderBy(updateTime)
.build()
.render(RenderingStrategies.MYBATIS3);
- return crawlSourceMapper.selectMany(render);
+ List crawlSources = crawlSourceMapper.selectMany(render);
+ PageBean pageBean = new PageBean<>(crawlSources);
+ pageBean.setList(BeanUtil.copyList(crawlSources, CrawlSourceVO.class));
+ return pageBean;
}
@SneakyThrows
@@ -156,14 +165,17 @@ public void addCrawlSingleTask(CrawlSingleTask singleTask) {
}
@Override
- public List listCrawlSingleTaskByPage(int page, int pageSize) {
+ public PageBean listCrawlSingleTaskByPage(int page, int pageSize) {
PageHelper.startPage(page, pageSize);
SelectStatementProvider render = select(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask.allColumns())
.from(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask)
.orderBy(CrawlSingleTaskDynamicSqlSupport.createTime.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
- return crawlSingleTaskMapper.selectMany(render);
+ List crawlSingleTasks = crawlSingleTaskMapper.selectMany(render);
+ PageBean pageBean = new PageBean<>(crawlSingleTasks);
+ pageBean.setList(BeanUtil.copyList(crawlSingleTasks, CrawlSingleTaskVO.class));
+ return pageBean;
}
@Override
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
index ae2afad5..c0e3c6cb 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
@@ -47,8 +47,7 @@ public ResultBean checkPenName(String penName){
@GetMapping("listBookByPage")
public ResultBean listBookByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize ,HttpServletRequest request){
- return ResultBean.ok(new PageInfo<>(bookService.listBookPageByUserId(getUserDetails(request).getId(),page,pageSize)
- ));
+ return ResultBean.ok(bookService.listBookPageByUserId(getUserDetails(request).getId(),page,pageSize));
}
/**
@@ -172,8 +171,7 @@ public ResultBean listIncomeDailyByPage(@RequestParam(value = "curr", defaultVal
@RequestParam(value = "endTime",defaultValue = "2030-01-01") Date endTime,
HttpServletRequest request){
- return ResultBean.ok(new PageInfo<>(authorService.listIncomeDailyByPage(page,pageSize,getUserDetails(request).getId(),bookId,startTime,endTime)
- ));
+ return ResultBean.ok(authorService.listIncomeDailyByPage(page,pageSize,getUserDetails(request).getId(),bookId,startTime,endTime));
}
@@ -186,8 +184,7 @@ public ResultBean listIncomeMonthByPage(@RequestParam(value = "curr", defaultVal
@RequestParam(value = "bookId", defaultValue = "0") Long bookId,
HttpServletRequest request){
- return ResultBean.ok(new PageInfo<>(authorService.listIncomeMonthByPage(page,pageSize,getUserDetails(request).getId(),bookId)
- ));
+ return ResultBean.ok(authorService.listIncomeMonthByPage(page,pageSize,getUserDetails(request).getId(),bookId));
}
private Author checkAuthor(HttpServletRequest request) {
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java b/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
index a55a4e30..766f13d2 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
@@ -1,9 +1,11 @@
package com.java2nb.novel.controller;
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.bean.ResultBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.enums.ResponseStatus;
+import com.java2nb.novel.entity.Book;
import com.java2nb.novel.entity.BookComment;
import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.service.BookService;
@@ -80,8 +82,7 @@ public ResultBean listBookCategory(){
* */
@GetMapping("searchByPage")
public ResultBean searchByPage(BookSpVO bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize){
- PageInfo pageInfo = bookService.searchByPage(bookSP,page,pageSize);
- return ResultBean.ok(pageInfo);
+ return ResultBean.ok(bookService.searchByPage(bookSP,page,pageSize));
}
/**
@@ -143,7 +144,7 @@ public ResultBean listRecBookByCatId(Integer catId) {
* */
@GetMapping("listCommentByPage")
public ResultBean listCommentByPage(@RequestParam("bookId") Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
- return ResultBean.ok(new PageInfo<>(bookService.listCommentByPage(null,bookId,page,pageSize)));
+ return ResultBean.ok(bookService.listCommentByPage(null,bookId,page,pageSize));
}
/**
@@ -172,7 +173,7 @@ public ResultBean queryNewIndexList(Long bookId){
* */
@GetMapping("/queryIndexList")
public ResultBean indexList(Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,@RequestParam(value = "orderBy",defaultValue = "index_num desc") String orderBy) {
- return ResultBean.ok(new PageInfo<>(bookService.queryIndexList(bookId,orderBy,page,pageSize)));
+ return ResultBean.ok(new PageBean<>(bookService.queryIndexList(bookId,orderBy,page,pageSize)));
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java b/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
index 0ca06ed1..930ea6fc 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
@@ -31,7 +31,7 @@ public ResultBean listIndexNews(){
* */
@GetMapping("listByPage")
public ResultBean listByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize){
- return ResultBean.ok(new PageInfo<>(newsService.listByPage(page,pageSize)));
+ return ResultBean.ok(newsService.listByPage(page,pageSize));
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
index 2d528206..42d24945 100644
--- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
@@ -1,6 +1,5 @@
package com.java2nb.novel.controller;
-import com.github.pagehelper.PageInfo;
import com.java2nb.novel.core.bean.ResultBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.cache.CacheService;
@@ -19,7 +18,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
import java.util.HashMap;
import java.util.Map;
@@ -147,7 +145,7 @@ public ResultBean listBookShelfByPage(@RequestParam(value = "curr", defaultValue
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(userService.listBookShelfByPage(userDetails.getId(),page,pageSize)));
+ return ResultBean.ok(userService.listBookShelfByPage(userDetails.getId(),page,pageSize));
}
/**
@@ -159,7 +157,7 @@ public ResultBean listReadHistoryByPage(@RequestParam(value = "curr", defaultVal
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(userService.listReadHistoryByPage(userDetails.getId(),page,pageSize)));
+ return ResultBean.ok(userService.listReadHistoryByPage(userDetails.getId(),page,pageSize));
}
/**
@@ -197,7 +195,7 @@ public ResultBean listUserFeedBackByPage(@RequestParam(value = "curr", defaultVa
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(userService.listUserFeedBackByPage(userDetails.getId(),page,pageSize)));
+ return ResultBean.ok(userService.listUserFeedBackByPage(userDetails.getId(),page,pageSize));
}
/**
@@ -257,7 +255,7 @@ public ResultBean listCommentByPage(@RequestParam(value = "curr", defaultValue =
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
}
- return ResultBean.ok(new PageInfo<>(bookService.listCommentByPage(userDetails.getId(),null,page,pageSize)));
+ return ResultBean.ok(bookService.listCommentByPage(userDetails.getId(),null,page,pageSize));
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java b/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
index fae2dbec..f94267c4 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.entity.Author;
import com.java2nb.novel.entity.AuthorIncome;
import com.java2nb.novel.entity.AuthorIncomeDetail;
@@ -111,9 +112,9 @@ public interface AuthorService {
* @param bookId 小说ID
* @param startTime 开始时间
* @param endTime 结束时间
- * @return 日收入统计数据列表
+ * @return 日收入统计数据分页数据
*/
- List listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime);
+ PageBean listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime);
/**
@@ -122,7 +123,7 @@ public interface AuthorService {
* @param pageSize 分页大小
* @param userId 用户ID
* @param bookId 小说ID
- * @return
+ * @return 分页数据
* */
- List listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
+ PageBean listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/BookService.java b/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
index 47a5ef80..59518c04 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
@@ -2,6 +2,7 @@
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.vo.BookCommentVO;
import com.java2nb.novel.vo.BookSettingVO;
@@ -48,7 +49,7 @@ public interface BookService {
* @param pageSize 分页大小
* @return 小说集合分页信息
* */
- PageInfo searchByPage(BookSpVO params, int page, int pageSize);
+ PageBean searchByPage(BookSpVO params, int page, int pageSize);
/**
* 查询小说分类列表
@@ -144,9 +145,9 @@ public interface BookService {
* @param bookId 书籍ID
* @param page 页码
* @param pageSize 分页大小
- * @return 评论集合
+ * @return 评论分页数据
* */
- List listCommentByPage(Long userId, Long bookId, int page, int pageSize);
+ PageBean listCommentByPage(Long userId, Long bookId, int page, int pageSize);
/**
* 新增评价
@@ -202,9 +203,9 @@ public interface BookService {
* @param userId 用户ID
* @param page 页码
* @param pageSize 分页大小
- * @return 小说集合
+ * @return 小说分页数据
* */
- List listBookPageByUserId(Long userId, int page, int pageSize);
+ PageBean listBookPageByUserId(Long userId, int page, int pageSize);
/**
* 发布小说
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java b/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
index 72ea6876..32234397 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.entity.News;
import com.java2nb.novel.vo.NewsVO;
@@ -28,7 +29,7 @@ public interface NewsService {
* 分页查询新闻列表
* @param page 页码
* @param pageSize 分页大小
- * @return 新闻集合
+ * @return 新闻分页数据
* */
- List listByPage(int page, int pageSize);
+ PageBean listByPage(int page, int pageSize);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java b/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
index b1c73434..52f15214 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
@@ -2,8 +2,11 @@
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.entity.Book;
import com.java2nb.novel.vo.BookSpVO;
+import com.java2nb.novel.vo.BookVO;
+import com.java2nb.novel.vo.EsBookVO;
/**
* @author 11797
@@ -23,5 +26,5 @@ public interface SearchService {
* @param pageSize 每页大小
* @return 分页信息
*/
- PageInfo searchBook(BookSpVO params, int page, int pageSize);
+ PageBean searchBook(BookSpVO params, int page, int pageSize);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
index 8d08a573..9826e6ed 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/UserService.java
@@ -1,8 +1,10 @@
package com.java2nb.novel.service;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.entity.UserBuyRecord;
+import com.java2nb.novel.entity.UserFeedback;
import com.java2nb.novel.vo.BookReadHistoryVO;
import com.java2nb.novel.vo.BookShelfVO;
import com.java2nb.novel.entity.User;
@@ -58,9 +60,9 @@ public interface UserService {
* @param userId 用户ID
* @param page
* @param pageSize
- * @return 书架集合
+ * @return 书架分页信息
* */
- List listBookShelfByPage(Long userId, int page, int pageSize);
+ PageBean listBookShelfByPage(Long userId, int page, int pageSize);
/**
* 添加阅读记录
@@ -82,9 +84,9 @@ public interface UserService {
* @param userId 用户ID
* @param page 页码
* @param pageSize 分页大小
- * @return 反馈集合
+ * @return 反馈分页数据
* */
- List listUserFeedBackByPage(Long userId, int page, int pageSize);
+ PageBean listUserFeedBackByPage(Long userId, int page, int pageSize);
/**
* 查询个人信息
@@ -98,9 +100,9 @@ public interface UserService {
* @param userId 用户id
* @param page 页码
* @param pageSize 分页大小
- * @return
+ * @return 分页数据
* */
- List listReadHistoryByPage(Long userId, int page, int pageSize);
+ PageBean listReadHistoryByPage(Long userId, int page, int pageSize);
/**
* 更新个人信息
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
index 29881fd7..5e8b31d6 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service.impl;
import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.cache.CacheKey;
import com.java2nb.novel.core.cache.CacheService;
import com.java2nb.novel.core.enums.ResponseStatus;
@@ -170,9 +171,9 @@ public boolean queryIsStatisticsDaily(Long authorId, Long bookId, Date date) {
@Override
- public List listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime) {
+ public PageBean listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime) {
PageHelper.startPage(page, pageSize);
- return authorIncomeDetailMapper.selectMany(
+ return new PageBean<>(authorIncomeDetailMapper.selectMany(
select(AuthorIncomeDetailDynamicSqlSupport.incomeDate, AuthorIncomeDetailDynamicSqlSupport.incomeAccount
, AuthorIncomeDetailDynamicSqlSupport.incomeCount, AuthorIncomeDetailDynamicSqlSupport.incomeNumber)
.from(AuthorIncomeDetailDynamicSqlSupport.authorIncomeDetail)
@@ -182,14 +183,14 @@ public List listIncomeDailyByPage(int page, int pageSize, Lo
.and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isLessThanOrEqualTo(endTime))
.orderBy(AuthorIncomeDetailDynamicSqlSupport.incomeDate.descending())
.build()
- .render(RenderingStrategies.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3)));
}
@Override
- public List listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId) {
+ public PageBean listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId) {
PageHelper.startPage(page, pageSize);
- return authorIncomeMapper.selectMany(select(AuthorIncomeDynamicSqlSupport.incomeMonth
+ return new PageBean<>(authorIncomeMapper.selectMany(select(AuthorIncomeDynamicSqlSupport.incomeMonth
, AuthorIncomeDynamicSqlSupport.preTaxIncome
, AuthorIncomeDynamicSqlSupport.afterTaxIncome
, AuthorIncomeDynamicSqlSupport.payStatus
@@ -199,6 +200,6 @@ public List listIncomeMonthByPage(int page, int pageSize, Long use
.and(AuthorIncomeDynamicSqlSupport.bookId, isEqualTo(bookId))
.orderBy(AuthorIncomeDynamicSqlSupport.incomeMonth.descending())
.build()
- .render(RenderingStrategies.MYBATIS3));
+ .render(RenderingStrategies.MYBATIS3)));
}
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
index 2d90146f..9753c1a5 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.cache.CacheKey;
import com.java2nb.novel.core.cache.CacheService;
import com.java2nb.novel.core.config.BookPriceProperties;
@@ -186,7 +187,7 @@ public List listUpdateRank() {
}
@Override
- public PageInfo searchByPage(BookSpVO params, int page, int pageSize) {
+ public PageBean searchByPage(BookSpVO params, int page, int pageSize) {
if (params.getUpdatePeriod() != null) {
@@ -213,7 +214,7 @@ public PageInfo searchByPage(BookSpVO params, int page, int pageSize) {
if (StringUtils.isNotBlank(params.getSort())) {
OrderByHelper.orderBy(params.getSort() + " desc");
}
- return new PageInfo<>(bookMapper.searchByPage(params));
+ return new PageBean(bookMapper.searchByPage(params));
}
@@ -382,10 +383,10 @@ public Long queryFirstBookIndexId(Long bookId) {
}
@Override
- public List listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
+ public PageBean listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
OrderByHelper.orderBy("t1.create_time desc");
- return bookCommentMapper.listCommentByPage(userId, bookId);
+ return new PageBean<>(bookCommentMapper.listCommentByPage(userId, bookId));
}
@Transactional(rollbackFor = Exception.class)
@@ -491,7 +492,7 @@ public void updateBookPicToLocal(String picUrl, Long bookId) {
}
@Override
- public List listBookPageByUserId(Long userId, int page, int pageSize) {
+ public PageBean listBookPageByUserId(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
@@ -501,7 +502,7 @@ public List listBookPageByUserId(Long userId, int page, int pageSize) {
.orderBy(BookDynamicSqlSupport.createTime.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
- return bookMapper.selectMany(selectStatement);
+ return new PageBean<>(bookMapper.selectMany(selectStatement));
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
index 5f731bbc..0863c73e 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service.impl;
import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.utils.BeanUtil;
import com.java2nb.novel.service.NewsService;
import com.java2nb.novel.core.cache.CacheKey;
@@ -59,14 +60,16 @@ public News queryNewsInfo(Long newsId) {
}
@Override
- public List listByPage(int page, int pageSize) {
+ public PageBean listByPage(int page, int pageSize) {
PageHelper.startPage(page,pageSize);
SelectStatementProvider selectStatement = select(id, catName, catId, title,createTime)
.from(news)
.orderBy(createTime.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
-
- return BeanUtil.copyList(newsMapper.selectMany(selectStatement),NewsVO.class);
+ List news = newsMapper.selectMany(selectStatement);
+ PageBean pageBean = new PageBean<>(news);
+ pageBean.setList(BeanUtil.copyList(news,NewsVO.class));
+ return pageBean;
}
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
index 9def5a07..b77e7a63 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
@@ -3,12 +3,14 @@
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.enums.ResponseStatus;
import com.java2nb.novel.core.exception.BusinessException;
import com.java2nb.novel.core.utils.StringUtil;
import com.java2nb.novel.entity.Book;
import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.service.SearchService;
+import com.java2nb.novel.vo.BookVO;
import com.java2nb.novel.vo.EsBookVO;
import io.searchbox.client.JestClient;
import io.searchbox.core.Count;
@@ -71,7 +73,7 @@ public void importToEs(Book book) {
@SneakyThrows
@Override
- public PageInfo searchBook(BookSpVO params, int page, int pageSize) {
+ public PageBean searchBook(BookSpVO params, int page, int pageSize) {
List bookList = new ArrayList<>(0);
//使用搜索引擎搜索
@@ -199,11 +201,7 @@ public PageInfo searchBook(BookSpVO params, int page, int pageSize) {
}
}
- PageInfo pageInfo = new PageInfo<>(bookList);
- pageInfo.setTotal(total.longValue());
- pageInfo.setPageNum(page);
- pageInfo.setPageSize(pageSize);
- return pageInfo;
+ return new PageBean<>(page,pageSize,total.longValue(),bookList);
}
throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL);
}
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
index 6b85319a..e3b971a1 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
@@ -1,6 +1,7 @@
package com.java2nb.novel.service.impl;
import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.core.bean.PageBean;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.utils.BeanUtil;
import com.java2nb.novel.entity.*;
@@ -147,9 +148,9 @@ public void removeFromBookShelf(Long userId, Long bookId) {
}
@Override
- public List listBookShelfByPage(Long userId, int page, int pageSize) {
+ public PageBean listBookShelfByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
- return userBookshelfMapper.listBookShelf(userId);
+ return new PageBean<>(userBookshelfMapper.listBookShelf(userId));
}
@Transactional(rollbackFor = Exception.class)
@@ -201,7 +202,7 @@ public void addFeedBack(Long userId, String content) {
}
@Override
- public List listUserFeedBackByPage(Long userId, int page, int pageSize) {
+ public PageBean listUserFeedBackByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
SelectStatementProvider selectStatement = select(UserFeedbackDynamicSqlSupport.content, UserFeedbackDynamicSqlSupport.createTime)
.from(userFeedback)
@@ -209,7 +210,10 @@ public List listUserFeedBackByPage(Long userId, int page, int pa
.orderBy(UserFeedbackDynamicSqlSupport.id.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
- return BeanUtil.copyList(userFeedbackMapper.selectMany(selectStatement),UserFeedbackVO.class);
+ List userFeedbacks = userFeedbackMapper.selectMany(selectStatement);
+ PageBean pageBean = new PageBean<>(userFeedbacks);
+ pageBean.setList(BeanUtil.copyList(userFeedbacks,UserFeedbackVO.class));
+ return pageBean;
}
@Override
@@ -223,9 +227,9 @@ public User userInfo(Long userId) {
}
@Override
- public List listReadHistoryByPage(Long userId, int page, int pageSize) {
+ public PageBean listReadHistoryByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
- return userReadHistoryMapper.listReadHistory(userId);
+ return new PageBean<>(userReadHistoryMapper.listReadHistory(userId));
}
@Override