视频审核分发

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleVideoAuditService.java

@@ -118,25 +118,23 @@ public class ArticleVideoAuditService {
         }
     }
 
-    public ArticleVideoAuditListVO next(ArticleVideoAuditListParam param) {
+    public Page<ArticleVideoAuditListVO> next(ArticleVideoAuditListParam param) {
         if (Objects.nonNull(param.getSourceProducePlan())) {
             param.setPageSize(1);
-            Page<ArticleVideoAuditListVO> page = list(param);
-            if (CollectionUtils.isEmpty(page.getObjs())) {
-                return null;
-            }
-            return page.getObjs().get(0);
+            return list(param);
         }
+        Page<ArticleVideoAuditListVO> result = new Page<>();
         // 根据配置判断当日是否审核完成 并 选择内容池返回
         String poolLevel = getAuditPoolLevel();
-        ArticleVideoAuditListVO result = articleAuditMapper.articleVideoAuditNext(param.getContentId(),
+        ArticleVideoAuditListVO item = articleAuditMapper.articleVideoAuditNext(param.getContentId(),
                 param.getStatus(), param.getTitle(), param.getAuditAccount(), param.getSourceProducePlan(), poolLevel);
-        if (Objects.isNull(result)) {
-            return null;
+        if (Objects.isNull(item)) {
+            return result;
         }
-        List<ArticleVideoAuditListVO> list = Collections.singletonList(result);
+        List<ArticleVideoAuditListVO> list = Collections.singletonList(item);
         buildArticleVideoAuditListVO(list);
-        return list.get(0);
+        result.setObjs(list);
+        return result;
     }
 
     private String getAuditPoolLevel() {

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/VideoPoolAuditService.java

@@ -92,25 +92,22 @@ public class VideoPoolAuditService {
         return result;
     }
 
-    public VideoPoolAuditListVO next(VideoPoolAuditListParam param) {
+    public Page<VideoPoolAuditListVO> next(VideoPoolAuditListParam param) {
         if (Objects.nonNull(param.getFlowPoolLevel())) {
             param.setPageSize(1);
-            Page<VideoPoolAuditListVO> page = list(param);
-            if (CollectionUtils.isEmpty(page.getObjs())) {
-                return null;
-            }
-            return page.getObjs().get(0);
+            return list(param);
         }
+        Page<VideoPoolAuditListVO> result = new Page<>();
         // 根据配置判断当日是否审核完成 并 选择内容池返回
         Integer poolLevel = getAuditPoolLevel();
         PublishSingleVideoSource obj = videoPoolAuditMapper.articleVideoAuditNext(param.getContentId(),
                 param.getStatus(), param.getTitle(), param.getAuditAccount(), poolLevel);
         if (Objects.isNull(obj)) {
-            return null;
+            return result;
         }
-        List<PublishSingleVideoSource> list = Collections.singletonList(obj);
-        List<VideoPoolAuditListVO> result = buildVideoPoolAuditListVO(list);
-        return result.get(0);
+        List<VideoPoolAuditListVO> list = buildVideoPoolAuditListVO(Collections.singletonList(obj));
+        result.setObjs(list);
+        return result;
     }
 
     private Integer getAuditPoolLevel() {

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleVideoAuditController.java

@@ -25,7 +25,7 @@ public class ArticleVideoAuditController {
     }
 
     @PostMapping("/next")
-    public CommonResponse<ArticleVideoAuditListVO> articleVideoAuditNext(@RequestBody ArticleVideoAuditListParam param) {
+    public CommonResponse<Page<ArticleVideoAuditListVO>> articleVideoAuditNext(@RequestBody ArticleVideoAuditListParam param) {
         return CommonResponse.success(service.next(param));
     }
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/VideoPoolAuditController.java

@@ -25,7 +25,7 @@ public class VideoPoolAuditController {
     }
 
     @PostMapping("/next")
-    public CommonResponse<VideoPoolAuditListVO> articleVideoAuditNext(@RequestBody VideoPoolAuditListParam param) {
+    public CommonResponse<Page<VideoPoolAuditListVO>> articleVideoAuditNext(@RequestBody VideoPoolAuditListParam param) {
         return CommonResponse.success(service.next(param));
     }