Browse Source

视频匹配长文,查询去除分页

wangyunpeng 1 ngày trước cách đây
mục cha
commit
5362b0548a

+ 4 - 4
core/src/main/java/com/tzld/videoVector/model/param/VideoArticleMatchQueryParam.java

@@ -14,9 +14,9 @@ public class VideoArticleMatchQueryParam {
     /** 三级渠道(账号),可选,支持多个 */
     private String channelLevel3;
 
-    /** 页码,从1开始,默认1 */
-    private Integer pageNum = 1;
+    /** 页码,从1开始,不传则查询全部 */
+    private Integer pageNum;
 
-    /** 每页大小,默认20 */
-    private Integer pageSize = 20;
+    /** 每页大小,不传则查询全部 */
+    private Integer pageSize;
 }

+ 3 - 3
core/src/main/java/com/tzld/videoVector/service/VideoArticleMatchService.java

@@ -10,10 +10,10 @@ import com.tzld.videoVector.model.po.pgVector.VideoArticleMatchResult;
 public interface VideoArticleMatchService {
 
     /**
-     * 按条件分页查询匹配结果
+     * 按条件查询匹配结果。分页参数可选,不传则查询全部。
      *
-     * @param param 查询参数(dt 必填,channelLevel3 可选)
-     * @return 分页结果
+     * @param param 查询参数(dt 可选,channelLevel3 可选,pageNum/pageSize 可选)
+     * @return 分页结果(未传分页参数时总数字段即为全量记录数)
      */
     PageResult<VideoArticleMatchResult> queryMatchResult(VideoArticleMatchQueryParam param);
 }

+ 13 - 10
core/src/main/java/com/tzld/videoVector/service/impl/VideoArticleMatchServiceImpl.java

@@ -38,8 +38,7 @@ public class VideoArticleMatchServiceImpl implements VideoArticleMatchService {
             if (!StringUtils.hasText(dt)) {
                 log.info("video_article_match_result 表为空,返回空结果");
                 return PageResult.of(
-                        java.util.Collections.emptyList(), 0,
-                        param.getPageNum() != null ? param.getPageNum() : 1,
+                        java.util.Collections.emptyList(), 0, 1,
                         param.getPageSize() != null ? param.getPageSize() : 20);
             }
             log.info("dt 未传,自动取最大 dt={}", dt);
@@ -57,13 +56,17 @@ public class VideoArticleMatchServiceImpl implements VideoArticleMatchService {
         // 按创建时间倒序
         example.setOrderByClause("create_time DESC");
 
-        int pageNum = param.getPageNum() != null ? param.getPageNum() : 1;
-        int pageSize = param.getPageSize() != null ? param.getPageSize() : 20;
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<VideoArticleMatchResult> list = videoArticleMatchResultMapper.selectByExample(example);
-        PageInfo<VideoArticleMatchResult> pageInfo = new PageInfo<>(list);
-
-        return PageResult.of(list, pageInfo.getTotal(), pageNum, pageSize);
+        // 分页参数可选:不传则查询全部
+        boolean hasPagination = param.getPageNum() != null && param.getPageSize() != null;
+        if (hasPagination) {
+            PageHelper.startPage(param.getPageNum(), param.getPageSize());
+            List<VideoArticleMatchResult> list = videoArticleMatchResultMapper.selectByExample(example);
+            PageInfo<VideoArticleMatchResult> pageInfo = new PageInfo<>(list);
+            return PageResult.of(list, pageInfo.getTotal(), param.getPageNum(), param.getPageSize());
+        } else {
+            List<VideoArticleMatchResult> list = videoArticleMatchResultMapper.selectByExample(example);
+            log.info("未传分页参数,返回全部 {} 条记录", list.size());
+            return PageResult.of(list, list.size(), 1, list.size());
+        }
     }
 }

+ 3 - 3
server/src/main/java/com/tzld/videoVector/controller/VideoArticleMatchController.java

@@ -22,13 +22,13 @@ public class VideoArticleMatchController {
     private VideoArticleMatchService videoArticleMatchService;
 
     /**
-     * 按账号查询匹配结果。
+     * 按账号查询匹配结果。分页参数可选,不传则查询全部。
      * <p>dt 不传时自动取表中最新日期的数据。
      *
      * <pre>
      * POST /videoVector/videoArticleMatch/query
-     * body: { "channelLevel3": "趣味生活方式", "pageNum": 1, "pageSize": 20 }
-     *   or: { "dt": "20260615", "channelLevel3": "趣味生活方式" }
+     * body: { "channelLevel3": "趣味生活方式", "pageNum": 1, "pageSize": 20 }  // 分页
+     *   or: { "dt": "20260615", "channelLevel3": "趣味生活方式" }              // 全量
      * </pre>
      */
     @PostMapping("/query")