201206030/novel-plus
1
0
Fork 0
mirror of https://github.com/201206030/novel-plus.git synced 2025-06-24 04:46:37 +00:00
Code Issues Packages Releases Wiki Activity

修复部分分页接口的查询bug

Browse Source
This commit is contained in:
xiongxiaoyang
2021-02-04 23:59:26 +08:00
parent d22200b8c7
commit 19d4c6b778
22 changed files with 151 additions and 1105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
View File

@ -47,8 +47,7 @@ public class AuthorController extends BaseController{
@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 class AuthorController extends BaseController{
@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 class AuthorController extends BaseController{
@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) {

9
novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
View File

@ -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 class BookController extends BaseController{
* */
@GetMapping("searchByPage")
public ResultBean searchByPage(BookSpVO bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize){
PageInfo<BookVO> pageInfo = bookService.searchByPage(bookSP,page,pageSize);
return ResultBean.ok(pageInfo);
return ResultBean.ok(bookService.searchByPage(bookSP,page,pageSize));
}
/**
@ -143,7 +144,7 @@ public class BookController extends BaseController{
* */
@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 class BookController extends BaseController{
* */
@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)));
}

2
novel-front/src/main/java/com/java2nb/novel/controller/NewsController.java
View File

@ -31,7 +31,7 @@ public class NewsController {
* */
@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));
}

10
novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
View File

@ -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.validation.annotation.Validated;
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 class UserController extends BaseController {
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 class UserController extends BaseController {
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 class UserController extends BaseController {
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 class UserController extends BaseController {
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));
}

9
novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java
View File

@ -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<AuthorIncomeDetail> listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime);
PageBean<AuthorIncomeDetail> 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<AuthorIncome> listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
PageBean<AuthorIncome> listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
}

11
novel-front/src/main/java/com/java2nb/novel/service/BookService.java
View File

@ -2,6 +2,7 @@ package com.java2nb.novel.service;
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<BookCommentVO> listCommentByPage(Long userId, Long bookId, int page, int pageSize);
PageBean<BookCommentVO> 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<Book> listBookPageByUserId(Long userId, int page, int pageSize);
PageBean<Book> listBookPageByUserId(Long userId, int page, int pageSize);
/**
* 发布小说

5
novel-front/src/main/java/com/java2nb/novel/service/NewsService.java
View File

@ -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<NewsVO> listByPage(int page, int pageSize);
PageBean<News> listByPage(int page, int pageSize);
}

5
novel-front/src/main/java/com/java2nb/novel/service/SearchService.java
View File

@ -2,8 +2,11 @@ package com.java2nb.novel.service;
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<EsBookVO> searchBook(BookSpVO params, int page, int pageSize);
}

14
novel-front/src/main/java/com/java2nb/novel/service/UserService.java
View File

@ -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<BookShelfVO> listBookShelfByPage(Long userId, int page, int pageSize);
PageBean<BookShelfVO> listBookShelfByPage(Long userId, int page, int pageSize);
/**
* 添加阅读记录
@ -82,9 +84,9 @@ public interface UserService {
* @param userId 用户ID
* @param page 页码
* @param pageSize 分页大小
* @return 反馈集合
* @return 反馈分页数据
* */
List<UserFeedbackVO> listUserFeedBackByPage(Long userId, int page, int pageSize);
PageBean<UserFeedback> listUserFeedBackByPage(Long userId, int page, int pageSize);
/**
* 查询个人信息
@ -98,9 +100,9 @@ public interface UserService {
* @param userId 用户id
* @param page 页码
* @param pageSize 分页大小
* @return
* @return 分页数据
* */
List<BookReadHistoryVO> listReadHistoryByPage(Long userId, int page, int pageSize);
PageBean<BookReadHistoryVO> listReadHistoryByPage(Long userId, int page, int pageSize);
/**
* 更新个人信息

13
novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java
View File

@ -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 class AuthorServiceImpl implements AuthorService {
@Override
public List<AuthorIncomeDetail> listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime) {
public PageBean<AuthorIncomeDetail> 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 class AuthorServiceImpl implements AuthorService {
.and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isLessThanOrEqualTo(endTime))
.orderBy(AuthorIncomeDetailDynamicSqlSupport.incomeDate.descending())
.build()
.render(RenderingStrategies.MYBATIS3));
.render(RenderingStrategies.MYBATIS3)));
}
@Override
public List<AuthorIncome> listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId) {
public PageBean<AuthorIncome> 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 class AuthorServiceImpl implements AuthorService {
.and(AuthorIncomeDynamicSqlSupport.bookId, isEqualTo(bookId))
.orderBy(AuthorIncomeDynamicSqlSupport.incomeMonth.descending())
.build()
.render(RenderingStrategies.MYBATIS3));
.render(RenderingStrategies.MYBATIS3)));
}
}

13
novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.java2nb.novel.service.impl;
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 class BookServiceImpl implements BookService {
}
@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 class BookServiceImpl implements BookService {
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 class BookServiceImpl implements BookService {
}
@Override
public List<BookCommentVO> listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
public PageBean<BookCommentVO> 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 class BookServiceImpl implements BookService {
}
@Override
public List<Book> listBookPageByUserId(Long userId, int page, int pageSize) {
public PageBean<Book> listBookPageByUserId(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
@ -501,7 +502,7 @@ public class BookServiceImpl implements BookService {
.orderBy(BookDynamicSqlSupport.createTime.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
return bookMapper.selectMany(selectStatement);
return new PageBean<>(bookMapper.selectMany(selectStatement));
}

9
novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java
View File

@ -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 class NewsServiceImpl implements NewsService {
}
@Override
public List<NewsVO> listByPage(int page, int pageSize) {
public PageBean<News> 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> news = newsMapper.selectMany(selectStatement);
PageBean<News> pageBean = new PageBean<>(news);
pageBean.setList(BeanUtil.copyList(news,NewsVO.class));
return pageBean;
}
}

10
novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
View File

@ -3,12 +3,14 @@ package com.java2nb.novel.service.impl;
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 class SearchServiceImpl implements SearchService {
@SneakyThrows
@Override
public PageInfo searchBook(BookSpVO params, int page, int pageSize) {
public PageBean<EsBookVO> searchBook(BookSpVO params, int page, int pageSize) {
List<EsBookVO> bookList = new ArrayList<>(0);
//使用搜索引擎搜索
@ -199,11 +201,7 @@ public class SearchServiceImpl implements SearchService {
}
}
PageInfo<EsBookVO> 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);
}

16
novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
View File

@ -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 class UserServiceImpl implements UserService {
}
@Override
public List<BookShelfVO> listBookShelfByPage(Long userId, int page, int pageSize) {
public PageBean<BookShelfVO> 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 class UserServiceImpl implements UserService {
}
@Override
public List<UserFeedbackVO> listUserFeedBackByPage(Long userId, int page, int pageSize) {
public PageBean<UserFeedback> 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 class UserServiceImpl implements UserService {
.orderBy(UserFeedbackDynamicSqlSupport.id.descending())
.build()
.render(RenderingStrategies.MYBATIS3);
return BeanUtil.copyList(userFeedbackMapper.selectMany(selectStatement),UserFeedbackVO.class);
List<UserFeedback> userFeedbacks = userFeedbackMapper.selectMany(selectStatement);
PageBean<UserFeedback> pageBean = new PageBean<>(userFeedbacks);
pageBean.setList(BeanUtil.copyList(userFeedbacks,UserFeedbackVO.class));
return pageBean;
}
@Override
@ -223,9 +227,9 @@ public class UserServiceImpl implements UserService {
}
@Override
public List<BookReadHistoryVO> listReadHistoryByPage(Long userId, int page, int pageSize) {
public PageBean<BookReadHistoryVO> listReadHistoryByPage(Long userId, int page, int pageSize) {
PageHelper.startPage(page, pageSize);
return userReadHistoryMapper.listReadHistory(userId);
return new PageBean<>(userReadHistoryMapper.listReadHistory(userId));
}
@Override