标签检索添加分页

src/main/java/cn/meteor/beyondclouds/modules/tag/api/TagApi.java

@@ -17,7 +17,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * @author 胡明森
@@ -56,11 +55,16 @@ public class TagApi {
 
     @ApiOperation("检索标签")
     @GetMapping("/tag/search")
-    public Response<List<Tag>> searchTags(@RequestParam("keywords") String keywords) {
-
-        List<Tag> tags = tagService.searchTags(keywords);
+    public Response<?> searchTags(@Valid PageForm pageForm,
+                                          BindingResult bindingResult,
+                                          @RequestParam("keywords") String keywords) {
+        if (bindingResult.hasErrors()) {
+            return Response.fieldError(bindingResult.getFieldError());
+        }
 
-        return Response.success(tags);
+        IPage<Tag> tagPage = tagService.searchTags(keywords, pageForm.getPage(), pageForm.getSize());
+        PageVO<Tag> tagPageVO = new PageVO<>(tagPage);
+        return Response.success(tagPageVO);
     }
 
 

src/main/java/cn/meteor/beyondclouds/modules/tag/service/ITagService.java

@@ -5,8 +5,6 @@ import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
  * 标签表 服务类
@@ -29,9 +27,11 @@ public interface ITagService extends IService<Tag> {
     /**
      * 检索标签
      * @param keywords
+     * @param pageNumber
+     * @param pageSize
      * @return
      */
-    List<Tag> searchTags(String keywords);
+    IPage<Tag> searchTags(String keywords, Integer pageNumber, Integer pageSize);
 
     /**
      * 我创建的标签列表

src/main/java/cn/meteor/beyondclouds/modules/tag/service/impl/TagServiceImpl.java

@@ -12,8 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 标签表 服务实现类
@@ -62,8 +60,12 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements ITagS
     }
 
     @Override
-    public List<Tag> searchTags(String keywords) {
-        return tagMapper.searchTags(keywords);
+    public IPage<Tag> searchTags(String keywords, Integer pageNumber, Integer pageSize) {
+        QueryWrapper<Tag> tagQueryWrapper = new QueryWrapper<>();
+        tagQueryWrapper.like("tag_name", keywords);
+
+        IPage<Tag> page = new Page<>(pageNumber, pageSize);
+        return page(page, tagQueryWrapper);
     }
 
     @Override