Commit c32f8f71 by 段启岩

优化tag,post

parent 4a5362d0
...@@ -61,7 +61,7 @@ public class BlogCommentApi { ...@@ -61,7 +61,7 @@ public class BlogCommentApi {
@ApiOperation("评论列表") @ApiOperation("评论列表")
@GetMapping("/blog/{blogId}/comments") @GetMapping("/blog/{blogId}/comments")
public Response<PageVO<BlogComment>> getBlogCommentPage(@PathVariable("blogId") String bLogId , public Response<PageVO<BlogComment>> getBlogCommentPage(@PathVariable("blogId") String bLogId,
@Valid PageForm pageForm , @Valid PageForm pageForm ,
@RequestParam(value = "parent_id",required = false) Integer parentId) { @RequestParam(value = "parent_id",required = false) Integer parentId) {
......
...@@ -30,7 +30,7 @@ import java.util.stream.Collectors; ...@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
@Api(tags = "动态API") @Api(tags = "动态API")
@RequestMapping("/api") @RequestMapping("/api")
@RestController @RestController
public class postApi { public class PostApi {
private IPostService postService; private IPostService postService;
...@@ -46,7 +46,7 @@ public class postApi { ...@@ -46,7 +46,7 @@ public class postApi {
* @param subject * @param subject
* @return * @return
*/ */
@ApiOperation("发布项目") @ApiOperation("发布动态")
@PostMapping("/post") @PostMapping("/post")
public Response publishPost(@RequestBody @Valid PostForm postForm , BindingResult result , public Response publishPost(@RequestBody @Valid PostForm postForm , BindingResult result ,
@CurrentSubject Subject subject) { @CurrentSubject Subject subject) {
......
...@@ -4,5 +4,5 @@ package cn.meteor.beyondclouds.modules.post.api; ...@@ -4,5 +4,5 @@ package cn.meteor.beyondclouds.modules.post.api;
* @author gaoTong * @author gaoTong
* @date 2020/2/2 9:42 * @date 2020/2/2 9:42
*/ */
public class postCommentApi { public class PostCommentApi {
} }
...@@ -55,8 +55,8 @@ public class TagApi { ...@@ -55,8 +55,8 @@ public class TagApi {
@ApiOperation("检索标签") @ApiOperation("检索标签")
@GetMapping("/tags/{keywords}") @GetMapping("/tag/search")
public Response<List<Tag>> searchTags(@PathVariable("keywords") String keywords) { public Response<List<Tag>> searchTags(@RequestParam("keywords") String keywords) {
List<Tag> tags = tagService.searchTags(keywords); List<Tag> tags = tagService.searchTags(keywords);
......
...@@ -58,8 +58,9 @@ public class TopicApi { ...@@ -58,8 +58,9 @@ public class TopicApi {
int pageNo = pageForm.getPage(); int pageNo = pageForm.getPage();
int pageSize = pageForm.getSize(); int pageSize = pageForm.getSize();
IPage<Topic> page = new Page<>(pageNo, pageSize); IPage<Topic> page = new Page<>(pageNo, pageSize);
IPage<Topic> topicPage = topicService.page(page);
return Response.success(topicService.page(page)); PageVO<Topic> topicPageVO = new PageVO<>(topicPage);
return Response.success(topicPageVO);
} }
...@@ -135,7 +136,7 @@ public class TopicApi { ...@@ -135,7 +136,7 @@ public class TopicApi {
@GetMapping("/my/topic/created") @GetMapping("/my/topic/created")
public Response<PageVO<Topic>> getMyTopics(@Valid PageForm pageForm, @CurrentSubject Subject subject) { public Response<PageVO<Topic>> getMyTopics(@Valid PageForm pageForm, @CurrentSubject Subject subject) {
// 根据用户获取列表并返回 // 根据用户获取列表并返回
IPage<Topic> topicPage = topicService.getProjectPage(pageForm.getPage(), pageForm.getSize(), (String) subject.getId()); IPage<Topic> topicPage = topicService.getTopicPage(pageForm.getPage(), pageForm.getSize(), (String) subject.getId());
PageVO<Topic> topicPageVO = new PageVO<>(topicPage); PageVO<Topic> topicPageVO = new PageVO<>(topicPage);
return Response.success(topicPageVO); return Response.success(topicPageVO);
} }
......
...@@ -64,5 +64,5 @@ public interface ITopicService extends IService<Topic> { ...@@ -64,5 +64,5 @@ public interface ITopicService extends IService<Topic> {
*/ */
IPage<User> getTopicsFollower(Integer page, Integer size, String topicId); IPage<User> getTopicsFollower(Integer page, Integer size, String topicId);
IPage<Topic> getProjectPage(Integer page, Integer size, String userId); IPage<Topic> getTopicPage(Integer page, Integer size, String userId);
} }
...@@ -176,7 +176,7 @@ public class TopicServiceImpl extends ServiceImpl<TopicMapper, Topic> implements ...@@ -176,7 +176,7 @@ public class TopicServiceImpl extends ServiceImpl<TopicMapper, Topic> implements
} }
@Override @Override
public IPage<Topic> getProjectPage(Integer pageNumber, Integer pageSize, String userId) { public IPage<Topic> getTopicPage(Integer pageNumber, Integer pageSize, String userId) {
IPage<Topic> page = new Page<>(pageNumber, pageSize); IPage<Topic> page = new Page<>(pageNumber, pageSize);
QueryWrapper<Topic> topicQueryWrapper = new QueryWrapper<>(); QueryWrapper<Topic> topicQueryWrapper = new QueryWrapper<>();
topicQueryWrapper.eq("user_id", userId); topicQueryWrapper.eq("user_id", userId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment