标签增加分页

ruoyi-generator/src/main/java/com/ruoyi/generator/controller/CommunityTagController.java

@@ -6,9 +6,11 @@ import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.user.ProjectException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.generator.domain.Community.*;
 import com.ruoyi.generator.mapper.community.CommunityTagBlockMapper;
@@ -96,7 +98,10 @@ public class CommunityTagController extends BaseController {
         }
         List<CommunityTag> communityTags = null;
         try {
-            Page<CommunityTag> page = new Page<>(1, 20);
+            int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+            int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+            int offset = (pageNum - 1) * pageSize;
+            Page<CommunityTag> page = new Page<>(offset, pageSize);
             communityTags = communityTagService.page(page, new QueryWrapper<CommunityTag>().and((wrapper) -> {
                         wrapper.ne("is_delete", 1)
                                 .or()
@@ -163,16 +168,22 @@ public class CommunityTagController extends BaseController {
     @Transactional
     //@Anonymous
     public AjaxResult likeTags(Long userId) {
+        int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+        int offset = (pageNum - 1) * pageSize;
+
+        Page<CommunityUserTag> page = new Page<>(offset, pageSize);
         if (userId == null) {
             userId = SecurityUtils.getUserId();
         }
         List<CommunityTag> communityTags = null;
         try {
-            //获取拉黑标签ID
+            //获取关注标签ID
+            QueryWrapper<CommunityUserTag> queryWrapper = new QueryWrapper<CommunityUserTag>()
+                    .eq("user_id", userId)
+                    .eq("is_delete", 0);
             List<CommunityUserTag> userTags = communityUserTagMapper
-                    .selectList(new QueryWrapper<CommunityUserTag>()
-                            .eq("user_id", userId)
-                            .eq("is_delete", 0));
+                    .selectPage(page, queryWrapper).getRecords();
 
             List<Long> tagList = userTags.stream().map(CommunityUserTag::getTagId).collect(Collectors.toList());
             if (tagList.size() == 0){
@@ -243,16 +254,22 @@ public class CommunityTagController extends BaseController {
             throw new ProjectException();
         }
 */
+        int pageNum = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
+        int pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
+        int offset = (pageNum - 1) * pageSize;
+
+        Page<CommunityTagBlock> page = new Page<>(offset, pageSize);
         if (userId == null) {
             userId = SecurityUtils.getUserId();
         }
         List<CommunityTag> communityTags = null;
         try {
             //获取拉黑标签ID
-            List<CommunityTagBlock> userTags = communityTagBlockMapper
-                    .selectList(new QueryWrapper<CommunityTagBlock>()
-                            .eq("user_id", userId)
-                            .eq("is_block", 1));
+            QueryWrapper<CommunityTagBlock> queryWrapper = new QueryWrapper<CommunityTagBlock>()
+                    .eq("user_id", userId)
+                    .eq("is_block", 1);
+
+            List<CommunityTagBlock> userTags = communityTagBlockMapper.selectPage(page, queryWrapper).getRecords();
 
             List<Long> tagList = userTags.stream().map(CommunityTagBlock::getTagId).collect(Collectors.toList());
             if (tagList.size() == 0){