refactor: 引入xxy-common相关依赖

This commit is contained in:
xiaoyang
2021-12-11 18:30:22 +08:00
parent 776083076c
commit 16e4c98a45
45 changed files with 252 additions and 899 deletions

View File

@ -1,8 +1,5 @@
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;
@ -15,6 +12,9 @@ import com.java2nb.novel.vo.BookSettingVO;
import com.java2nb.novel.vo.BookSpVO;
import com.java2nb.novel.service.BookService;
import com.java2nb.novel.vo.BookVO;
import io.github.xxyopen.model.page.PageBean;
import io.github.xxyopen.model.page.builder.pagehelper.PageBuilder;
import io.github.xxyopen.model.resp.RestResult;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
@ -49,56 +49,56 @@ public class BookController extends BaseController {
* 查询首页小说设置列表数据
*/
@GetMapping("listBookSetting")
public ResultBean<Map<Byte, List<BookSettingVO>>> listBookSetting() {
return ResultBean.ok(bookService.listBookSettingVO());
public RestResult<Map<Byte, List<BookSettingVO>>> listBookSetting() {
return RestResult.ok(bookService.listBookSettingVO());
}
/**
* 查询首页点击榜单数据
*/
@GetMapping("listClickRank")
public ResultBean<List<Book>> listClickRank() {
return ResultBean.ok(bookService.listClickRank());
public RestResult<List<Book>> listClickRank() {
return RestResult.ok(bookService.listClickRank());
}
/**
* 查询首页新书榜单数据
*/
@GetMapping("listNewRank")
public ResultBean<List<Book>> listNewRank() {
return ResultBean.ok(bookService.listNewRank());
public RestResult<List<Book>> listNewRank() {
return RestResult.ok(bookService.listNewRank());
}
/**
* 查询首页更新榜单数据
*/
@GetMapping("listUpdateRank")
public ResultBean<List<BookVO>> listUpdateRank() {
return ResultBean.ok(bookService.listUpdateRank());
public RestResult<List<BookVO>> listUpdateRank() {
return RestResult.ok(bookService.listUpdateRank());
}
/**
* 查询小说分类列表
*/
@GetMapping("listBookCategory")
public ResultBean<List<BookCategory>> listBookCategory() {
return ResultBean.ok(bookService.listBookCategory());
public RestResult<List<BookCategory>> listBookCategory() {
return RestResult.ok(bookService.listBookCategory());
}
/**
* 分页搜索
*/
@GetMapping("searchByPage")
public ResultBean<?> searchByPage(BookSpVO bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize) {
return ResultBean.ok(bookService.searchByPage(bookSP, page, pageSize));
public RestResult<?> searchByPage(BookSpVO bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize) {
return RestResult.ok(bookService.searchByPage(bookSP, page, pageSize));
}
/**
* 查询小说详情信息
*/
@GetMapping("queryBookDetail/{id}")
public ResultBean<Book> queryBookDetail(@PathVariable("id") Long id) {
return ResultBean.ok(bookService.queryBookDetail(id));
public RestResult<Book> queryBookDetail(@PathVariable("id") Long id) {
return RestResult.ok(bookService.queryBookDetail(id));
}
@ -106,28 +106,28 @@ public class BookController extends BaseController {
* 查询小说排行信息
*/
@GetMapping("listRank")
public ResultBean<List<Book>> listRank(@RequestParam(value = "type", defaultValue = "0") Byte type, @RequestParam(value = "limit", defaultValue = "30") Integer limit) {
return ResultBean.ok(bookService.listRank(type, limit));
public RestResult<List<Book>> listRank(@RequestParam(value = "type", defaultValue = "0") Byte type, @RequestParam(value = "limit", defaultValue = "30") Integer limit) {
return RestResult.ok(bookService.listRank(type, limit));
}
/**
* 增加点击次数
*/
@PostMapping("addVisitCount")
public ResultBean<Void> addVisitCount(Long bookId) {
public RestResult<Void> addVisitCount(Long bookId) {
if (enableMq == 1) {
rabbitTemplate.convertAndSend("ADD-BOOK-VISIT-EXCHANGE", null, bookId);
} else {
bookService.addVisitCount(bookId, 1);
}
return ResultBean.ok();
return RestResult.ok();
}
/**
* 查询章节相关信息
*/
@GetMapping("queryBookIndexAbout")
public ResultBean<Map<String, Object>> queryBookIndexAbout(Long bookId, Long lastBookIndexId) {
public RestResult<Map<String, Object>> queryBookIndexAbout(Long bookId, Long lastBookIndexId) {
Map<String, Object> data = new HashMap<>(2);
data.put("bookIndexCount", bookService.queryIndexCount(bookId));
BookIndex bookIndex = bookService.queryBookIndex(lastBookIndexId);
@ -136,15 +136,15 @@ public class BookController extends BaseController {
lastBookContent = lastBookContent.substring(0, 42);
}
data.put("lastBookContent", lastBookContent);
return ResultBean.ok(data);
return RestResult.ok(data);
}
/**
* 根据分类id查询同类推荐书籍
*/
@GetMapping("listRecBookByCatId")
public ResultBean<List<Book>> listRecBookByCatId(Integer catId) {
return ResultBean.ok(bookService.listRecBookByCatId(catId));
public RestResult<List<Book>> listRecBookByCatId(Integer catId) {
return RestResult.ok(bookService.listRecBookByCatId(catId));
}
@ -152,37 +152,37 @@ public class BookController extends BaseController {
* 分页查询书籍评论列表
*/
@GetMapping("listCommentByPage")
public ResultBean<PageBean<BookCommentVO>> listCommentByPage(@RequestParam("bookId") Long bookId, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
return ResultBean.ok(bookService.listCommentByPage(null, bookId, page, pageSize));
public RestResult<PageBean<BookCommentVO>> listCommentByPage(@RequestParam("bookId") Long bookId, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
return RestResult.ok(bookService.listCommentByPage(null, bookId, page, pageSize));
}
/**
* 新增评价
*/
@PostMapping("addBookComment")
public ResultBean<?> addBookComment(BookComment comment, HttpServletRequest request) {
public RestResult<?> addBookComment(BookComment comment, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return ResultBean.fail(ResponseStatus.NO_LOGIN);
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
bookService.addBookComment(userDetails.getId(), comment);
return ResultBean.ok();
return RestResult.ok();
}
/**
* 根据小说ID查询小说前十条最新更新目录集合
*/
@GetMapping("queryNewIndexList")
public ResultBean<List<BookIndex>> queryNewIndexList(Long bookId) {
return ResultBean.ok(bookService.queryIndexList(bookId, "index_num desc", 1, 10));
public RestResult<List<BookIndex>> queryNewIndexList(Long bookId) {
return RestResult.ok(bookService.queryIndexList(bookId, "index_num desc", 1, 10));
}
/**
* 目录页
*/
@GetMapping("/queryIndexList")
public ResultBean<PageBean<BookIndex>> 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 PageBean<>(bookService.queryIndexList(bookId, orderBy, page, pageSize)));
public RestResult<PageBean<BookIndex>> 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 RestResult.ok(PageBuilder.build(bookService.queryIndexList(bookId, orderBy, page, pageSize)));
}