api

api-module/src/main/java/com/tzld/piaoquan/api/controller/contentplatform/ContentPlatformApiController.java

@@ -45,7 +45,7 @@ public class ContentPlatformApiController {
     @ApiOperation(value = "获取视频嵌入路径")
     @PostMapping("/getVideoPageUrl")
     @JwtIgnore
-    public CommonResponse<List<CommonResponse<List<VideoPageUrlVO>>>> getVideoPageUrl(HttpServletRequest request,
+    public CommonResponse<List<VideoPageUrlVO>> getVideoPageUrl(HttpServletRequest request,
                                                                                       @RequestBody GetVideoPageUrlParam param) {
         String token = request.getHeader("token");
         return CommonResponse.success(apiService.getVideoPageUrl(token, param));

api-module/src/main/java/com/tzld/piaoquan/api/model/param/contentplatform/api/GetVideoPageUrlParam.java

@@ -13,6 +13,8 @@ public class GetVideoPageUrlParam {
 
     @Data
     public static class PlanItem {
+        @ApiModelProperty(value = "id")
+        private String id;
         @ApiModelProperty(value = "嵌入场景 0-自动回复 1-服务号定期推送")
         private Integer type;
         @ApiModelProperty(value = "公众号ghId")

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/api/VideoPageUrlVO.java

@@ -3,16 +3,28 @@ package com.tzld.piaoquan.api.model.vo.contentplatform.api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class VideoPageUrlVO {
 
-    @ApiModelProperty(value = "videoId")
-    private Long videoId;
-    @ApiModelProperty(value = "标题")
-    private String title;
-    @ApiModelProperty(value = "封面")
-    private String cover;
-    @ApiModelProperty(value = "嵌入小程序页面路径")
-    private String pageUrl;
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    private int code = 0;
+    private String msg = "success";
+    private List<VideoPageUrlItem> data;
+
+    @Data
+    public static class VideoPageUrlItem {
 
+        @ApiModelProperty(value = "videoId")
+        private Long videoId;
+        @ApiModelProperty(value = "标题")
+        private String title;
+        @ApiModelProperty(value = "封面")
+        private String cover;
+        @ApiModelProperty(value = "嵌入小程序页面路径")
+        private String pageUrl;
+    }
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/ContentPlatformApiService.java

@@ -5,7 +5,6 @@ import com.tzld.piaoquan.api.model.param.contentplatform.api.GetTokenParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.api.GetVideoPageUrlParam;
 import com.tzld.piaoquan.api.model.vo.contentplatform.api.VideoIdTitleVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.api.VideoPageUrlVO;
-import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
 
 import java.util.List;
@@ -16,5 +15,5 @@ public interface ContentPlatformApiService {
 
     Page<VideoIdTitleVO> getContent(String token, GetContentPageParam param);
 
-    List<CommonResponse<List<VideoPageUrlVO>>> getVideoPageUrl(String token, GetVideoPageUrlParam param);
+    List<VideoPageUrlVO> getVideoPageUrl(String token, GetVideoPageUrlParam param);
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformApiServiceImpl.java

@@ -23,7 +23,6 @@ import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformAccountServi
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformApiService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformCooperateAccountService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
-import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import com.tzld.piaoquan.growth.common.model.po.CgiReplyBucketData;
 import com.tzld.piaoquan.growth.common.utils.RedisUtils;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
@@ -120,12 +119,12 @@ public class ContentPlatformApiServiceImpl implements ContentPlatformApiService
     }
 
     @Override
-    public List<CommonResponse<List<VideoPageUrlVO>>> getVideoPageUrl(String token, GetVideoPageUrlParam param) {
+    public List<VideoPageUrlVO> getVideoPageUrl(String token, GetVideoPageUrlParam param) {
         ContentPlatformAccount account = checkToken(token);
         if (CollectionUtils.isEmpty(param.getPlanList()) || param.getPlanList().size() > 3) {
             throw new CommonException(ExceptionEnum.API_PAGE_URL_SIZE_TOO_LARGE);
         }
-        List<CommonResponse<List<VideoPageUrlVO>>> result = new ArrayList<>();
+        List<VideoPageUrlVO> result = new ArrayList<>();
         List<Long> videoIds = param.getPlanList().stream().flatMap(o -> o.getVideoIds().stream()).collect(Collectors.toList());
         List<ContentPlatformVideo> videoList = planMapperExt.getVideoListByIds(videoIds);
         Map<Long, ContentPlatformVideo> videoMap = videoList.stream().collect(Collectors.toMap(ContentPlatformVideo::getVideoId, video -> video));
@@ -137,7 +136,7 @@ public class ContentPlatformApiServiceImpl implements ContentPlatformApiService
         for (GetVideoPageUrlParam.PlanItem item : param.getPlanList()) {
             int code = 0;
             String msg = "";
-            List<VideoPageUrlVO> data = new ArrayList<>();
+            List<VideoPageUrlVO.VideoPageUrlItem> data = new ArrayList<>();
             try {
                 GzhPlanSaveParam saveParam = new GzhPlanSaveParam();
                 saveParam.setPublishStage(PublishStageEnum.USER.getVal());
@@ -164,7 +163,7 @@ public class ContentPlatformApiServiceImpl implements ContentPlatformApiService
                 List<CgiReplyBucketData> replyBucketDataList = cgiReplyService.getCgiReplyBucketDataListByGhIdVideoId(
                         gzhAccount.getGhId(), item.getVideoIds(), "manual");
                 for (CgiReplyBucketData cgiReplyBucketData : replyBucketDataList) {
-                    VideoPageUrlVO vo = new VideoPageUrlVO();
+                    VideoPageUrlVO.VideoPageUrlItem vo = new VideoPageUrlVO.VideoPageUrlItem();
                     vo.setVideoId(cgiReplyBucketData.getMiniVideoId());
                     vo.setTitle(cgiReplyBucketData.getTitle());
                     vo.setCover(cgiReplyBucketData.getCoverUrl());
@@ -175,7 +174,8 @@ public class ContentPlatformApiServiceImpl implements ContentPlatformApiService
                 code = -1;
                 msg = e.getMessage();
             } finally {
-                CommonResponse<List<VideoPageUrlVO>> response = new CommonResponse<>();
+                VideoPageUrlVO response = new VideoPageUrlVO();
+                response.setId(item.getId());
                 response.setCode(code);
                 response.setMsg(msg);
                 response.setData(data);