shen/novel-plus
1
0
Fork 0
mirror of https://github.com/201206030/novel-plus.git synced 2026-02-19 00:35:37 +08:00
Code Issues Packages Projects 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));
}