Merge branch 'master' of http://47.96.1.176:3000/work/book-api into xiaoqiantx

# Conflicts:
#	maku-framework/src/main/resources/auth.yml
This commit is contained in:
xiaoqiantx223 2024-07-18 17:47:40 +08:00
commit ce0d641770
4 changed files with 6 additions and 14 deletions

View File

@ -48,12 +48,11 @@ public class TBookCommentController {
return Result.ok(TBookCommentConvert.INSTANCE.convert(entity)); return Result.ok(TBookCommentConvert.INSTANCE.convert(entity));
} }
@PostMapping @PostMapping("/comment")
@Operation(summary = "保存") @Operation(summary = "保存")
@PreAuthorize("hasAuthority('maku:t_book_comment:save')") @PreAuthorize("hasAuthority('maku:t_book_comment:save')")
public Result<String> save(@RequestBody TBookCommentVO vo){ public Result<String> save(@RequestBody TBookCommentVO vo){
tBookCommentService.save(vo); tBookCommentService.save(vo);
return Result.ok(); return Result.ok();
} }

View File

@ -50,14 +50,10 @@ public class TBookController {
@GetMapping("/list/search") @GetMapping("/list/search")
@Operation(summary = "根据书名查询书籍") @Operation(summary = "根据书名查询书籍")
@Parameter @Parameter
public Result<TBookEntity> getByName(@RequestParam String name){ public Result<TBookEntity> getByName(@RequestParam String bookName){
TBookEntity entity = tBookService.getByName(name); TBookEntity entity = tBookService.getByName(bookName);
return Result.ok(entity); return Result.ok(entity);
} }
@GetMapping("page") @GetMapping("page")
@Operation(summary = "分页") @Operation(summary = "分页")
@PreAuthorize("hasAuthority('maku:t_book:page')") @PreAuthorize("hasAuthority('maku:t_book:page')")
@ -66,8 +62,6 @@ public class TBookController {
return Result.ok(page); return Result.ok(page);
} }
@GetMapping("{id}") @GetMapping("{id}")
@Operation(summary = "信息") @Operation(summary = "信息")
// @PreAuthorize("hasAuthority('maku:t_book:info')") // @PreAuthorize("hasAuthority('maku:t_book:info')")
@ -75,7 +69,6 @@ public class TBookController {
TBookEntity entity = tBookService.getById(id); TBookEntity entity = tBookService.getById(id);
return Result.ok(TBookConvert.INSTANCE.convert(entity)); return Result.ok(TBookConvert.INSTANCE.convert(entity));
} }
@PostMapping @PostMapping
@Operation(summary = "保存") @Operation(summary = "保存")
@PreAuthorize("hasAuthority('maku:t_book:save')") @PreAuthorize("hasAuthority('maku:t_book:save')")

View File

@ -24,5 +24,5 @@ public interface TBookService extends BaseService<TBookEntity> {
void delete(List<Long> idList); void delete(List<Long> idList);
TBookEntity getByName(String name); TBookEntity getByName(String bookName);
} }

View File

@ -62,9 +62,9 @@ public class TBookServiceImpl extends BaseServiceImpl<TBookDao, TBookEntity> imp
} }
@Override @Override
public TBookEntity getByName(String name) { public TBookEntity getByName(String bookName) {
LambdaQueryWrapper<TBookEntity> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<TBookEntity> wrapper = Wrappers.lambdaQuery();
wrapper.eq(TBookEntity::getBookName, name); wrapper.eq(TBookEntity::getBookName, bookName);
return baseMapper.selectOne(wrapper); return baseMapper.selectOne(wrapper);
} }