Merge branch '20250408-wyp-contentPlatform' into test

api-module/src/main/java/com/tzld/piaoquan/api/dao/mapper/contentplatform/ext/ContentPlatformPlanMapperExt.java

@@ -4,6 +4,7 @@ import com.tzld.piaoquan.api.model.param.contentplatform.GzhPlanListParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.QwPlanListParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.VideoContentListParam;
 import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlan;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlanVideo;
 import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformQwPlan;
 import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideo;
 import org.apache.ibatis.annotations.Param;
@@ -50,4 +51,6 @@ public interface ContentPlatformPlanMapperExt {
     void batchInsertQwPlan(@Param("records") List<ContentPlatformQwPlan> saveList);
 
     void insertQwPlanReturnId(@Param("record") ContentPlatformQwPlan qwPlan);
+
+    List<ContentPlatformGzhPlanVideo> getGzhPlanVideoListByCooperateAccountId(@Param("ghId") String ghId);
 }

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

@@ -2,6 +2,7 @@ package com.tzld.piaoquan.api.service.contentplatform;
 
 import com.tzld.piaoquan.api.model.param.contentplatform.*;
 import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlan;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlanVideo;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GzhPlanItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.QwPlanItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.VideoContentItemVO;
@@ -25,4 +26,6 @@ public interface ContentPlatformPlanService {
     void qwPlanSave(QwPlanSaveParam param);
 
     List<ContentPlatformGzhPlan> getGzhPlanListByCooperateAccountId(Long accountId);
+
+    List<ContentPlatformGzhPlanVideo> getGzhPlanVideoListByCooperateAccountId(String ghId);
 }

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

@@ -21,8 +21,11 @@ import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformCooperateAcc
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
 import com.tzld.piaoquan.growth.common.common.enums.GhTypeEnum;
 import com.tzld.piaoquan.growth.common.common.enums.StrategyStatusEnum;
+import com.tzld.piaoquan.growth.common.dao.mapper.CgiReplyBucketDataMapper;
 import com.tzld.piaoquan.growth.common.dao.mapper.ext.CgiReplyBucketDataMapperExt;
 import com.tzld.piaoquan.growth.common.model.bo.VideoDetail;
+import com.tzld.piaoquan.growth.common.model.po.CgiReplyBucketData;
+import com.tzld.piaoquan.growth.common.model.po.CgiReplyBucketDataExample;
 import com.tzld.piaoquan.growth.common.model.po.GhDetail;
 import com.tzld.piaoquan.growth.common.service.MessageAttachmentService;
 import com.tzld.piaoquan.growth.common.utils.MessageUtil;
@@ -50,6 +53,8 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
     @Autowired
     private ContentPlatformQwPlanVideoMapper qwPlanVideoMapper;
     @Autowired
+    private CgiReplyBucketDataMapper cgiReplyBucketDataMapper;
+    @Autowired
     private CgiReplyBucketDataMapperExt cgiReplyBucketDataMapperExt;
     @Autowired
     private ContentPlatformCooperateAccountService cooperateAccountService;
@@ -159,11 +164,21 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
 
     private void updateCgiReplyBucketData(String ghId, List<VideoContentItemVO> videoList) {
         for (VideoContentItemVO video : videoList) {
-            if (video.getTitleIsEdit() == 0 && video.getCoverIsEdit() == 0) {
+            if ((Objects.isNull(video.getTitleIsEdit()) || video.getTitleIsEdit() == 0)
+                    && (Objects.isNull(video.getCoverIsEdit()) || video.getCoverIsEdit() == 0)) {
+                continue;
+            }
+            CgiReplyBucketDataExample example = new CgiReplyBucketDataExample();
+            example.createCriteria().andGhIdEqualTo(ghId).andMiniVideoIdEqualTo(video.getVideoId())
+                            .andIsDeleteEqualTo(0);
+            List<CgiReplyBucketData> dataList = cgiReplyBucketDataMapper.selectByExample(example);
+            if (CollectionUtils.isEmpty(dataList)) {
                 continue;
             }
+            String existsCover = dataList.get(0).getCoverUrl();
+            String coverSuffix = existsCover.substring(existsCover.indexOf("/watermark"));
             cgiReplyBucketDataMapperExt.updateBucketDataTitleCoverByGhId(ghId, video.getVideoId(),
-                    video.getTitle(), video.getCover());
+                    video.getTitle(), video.getCover() + coverSuffix);
         }
     }
 
@@ -371,4 +386,9 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         qwPlanVideoMapper.insertSelective(item);
     }
 
+    @Override
+    public List<ContentPlatformGzhPlanVideo> getGzhPlanVideoListByCooperateAccountId(String ghId) {
+        return planMapperExt.getGzhPlanVideoListByCooperateAccountId(ghId);
+    }
+
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/BuckStrategyV1.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.tzld.piaoquan.api.common.enums.ReplyStrategyServiceEnum;
 import com.tzld.piaoquan.api.component.TouLiuHttpClient;
 import com.tzld.piaoquan.api.dao.mapper.AlgGhAutoreplyVideoRankDataMapper;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlanVideo;
+import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
 import com.tzld.piaoquan.growth.common.common.enums.StrategyStatusEnum;
 import com.tzld.piaoquan.growth.common.dao.mapper.CgiReplyBucketDataMapper;
 import com.tzld.piaoquan.growth.common.dao.mapper.GhDetailMapper;
@@ -67,6 +69,8 @@ public class BuckStrategyV1 implements ReplyStrategyService {
     private TouLiuHttpClient touLiuHttpClient;
     @Autowired
     private GhDetailMapper ghDetailMapper;
+    @Autowired
+    private ContentPlatformPlanService contentPlatformPlanService;
 
     @Override
     public ReplyBucketData getResult(BucketDataParam bucketDataParam) {
@@ -367,17 +371,29 @@ public class BuckStrategyV1 implements ReplyStrategyService {
             int sort = i + 1;
             Long videoId = bucketDataParam.getVideos().get(i);
             Map<Long, VideoDetail> videoDetailMap = touLiuHttpClient.getVideoDetailRequest(bucketDataParam.getVideos());
+            List<ContentPlatformGzhPlanVideo> gzhPlanVideoList = contentPlatformPlanService.getGzhPlanVideoListByCooperateAccountId(bucketDataParam.getGhId());
+            Map<Long, ContentPlatformGzhPlanVideo> gzhPlanVideoMap = gzhPlanVideoList.stream().collect(Collectors.toMap(ContentPlatformGzhPlanVideo::getVideoId, x -> x));
             CgiReplyBucketData cgiReplyBucketData = new CgiReplyBucketData();
             cgiReplyBucketData.setStrategy(key);
             cgiReplyBucketData.setSort(sort);
             cgiReplyBucketData.setGhId(bucketDataParam.getGhId());
             cgiReplyBucketData.setMsgType(1);
             VideoDetail videoDetail = videoDetailMap.get(videoId);
-            if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {
-                cgiReplyBucketData.setCoverUrl(videoDetail.getCover());
-            }
-            if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getTitle())) {
-                cgiReplyBucketData.setTitle(videoDetail.getTitle());
+            ContentPlatformGzhPlanVideo gzhPlanVideo = gzhPlanVideoMap.get(videoId);
+            // 内容合作平台视频标题和封面
+            if (Objects.nonNull(gzhPlanVideo)) {
+                cgiReplyBucketData.setTitle(gzhPlanVideo.getTitle());
+                if (StringUtils.isNotEmpty(gzhPlanVideo.getCover())) {
+                    String coverSuffix = videoDetail.getCover().substring(videoDetail.getCover().indexOf("/watermark"));
+                    cgiReplyBucketData.setCoverUrl(gzhPlanVideo.getCover() + coverSuffix);
+                }
+            } else {
+                if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {
+                    cgiReplyBucketData.setCoverUrl(videoDetail.getCover());
+                }
+                if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getTitle())) {
+                    cgiReplyBucketData.setTitle(videoDetail.getTitle());
+                }
             }
             cgiReplyBucketData.setMiniAppId(SMALL_APP_Id);
             cgiReplyBucketData.setMiniVideoId(videoId);

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/ThirdPartyPushMessageStrategyV1.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
 import com.tzld.piaoquan.api.common.enums.ReplyStrategyServiceEnum;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlanVideo;
+import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
 import com.tzld.piaoquan.growth.common.common.enums.StrategyStatusEnum;
 import com.tzld.piaoquan.api.component.TouLiuHttpClient;
 import com.tzld.piaoquan.api.dao.mapper.AlgGhAutoreplyVideoRankDataMapper;
@@ -60,6 +62,8 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
     private CgiReplyBucketDataMapper cgiReplyBucketDataMapper;
     @Autowired
     private TouLiuHttpClient touLiuHttpClient;
+    @Autowired
+    private ContentPlatformPlanService contentPlatformPlanService;
 
     @Override
     public ReplyBucketData getResult(BucketDataParam bucketDataParam) {
@@ -237,6 +241,8 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
                     continue;
                 }
                 Map<Long, VideoDetail> videoDetailMap = touLiuHttpClient.getVideoDetailRequest(bucketDataParam.getVideos());
+                List<ContentPlatformGzhPlanVideo> gzhPlanVideoList = contentPlatformPlanService.getGzhPlanVideoListByCooperateAccountId(bucketDataParam.getGhId());
+                Map<Long, ContentPlatformGzhPlanVideo> gzhPlanVideoMap = gzhPlanVideoList.stream().collect(Collectors.toMap(ContentPlatformGzhPlanVideo::getVideoId, x -> x));
                 for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
                     int sort = i + 1;
                     Long videoId = bucketDataParam.getVideos().get(i);
@@ -246,11 +252,21 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
                     cgiReplyBucketData.setGhId(bucketDataParam.getGhId());
                     cgiReplyBucketData.setMsgType(1);
                     VideoDetail videoDetail = videoDetailMap.get(videoId);
-                    if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {
-                        cgiReplyBucketData.setCoverUrl(videoDetail.getCover());
-                    }
-                    if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getTitle())) {
-                        cgiReplyBucketData.setTitle(videoDetail.getTitle());
+                    ContentPlatformGzhPlanVideo gzhPlanVideo = gzhPlanVideoMap.get(videoId);
+                    // 内容合作平台视频标题和封面
+                    if (Objects.nonNull(gzhPlanVideo)) {
+                        cgiReplyBucketData.setTitle(gzhPlanVideo.getTitle());
+                        if (StringUtils.isNotEmpty(gzhPlanVideo.getCover())) {
+                            String coverSuffix = videoDetail.getCover().substring(videoDetail.getCover().indexOf("/watermark"));
+                            cgiReplyBucketData.setCoverUrl(gzhPlanVideo.getCover() + coverSuffix);
+                        }
+                    } else {
+                        if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {
+                            cgiReplyBucketData.setCoverUrl(videoDetail.getCover());
+                        }
+                        if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getTitle())) {
+                            cgiReplyBucketData.setTitle(videoDetail.getTitle());
+                        }
                     }
                     cgiReplyBucketData.setMiniAppId(SMALL_APP_Id);
                     cgiReplyBucketData.setMiniVideoId(videoId);

api-module/src/main/resources/mapper/contentplatform/ext/ContentPlatformPlanMapperExt.xml

@@ -165,4 +165,15 @@
                 #{record.createAccountId}, #{record.createTimestamp}, #{record.updateTimestamp})
     </insert>
 
+    <select id="getGzhPlanVideoListByCooperateAccountId"
+            resultType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformGzhPlanVideo">
+        select cpgpv.*
+        from content_platform_gzh_plan_video cpgpv
+         join content_platform_gzh_plan cpgp on cpgp.id = cpgpv.plan_id
+         join content_platform_gzh_account cpgac on cpgac.id = cpgp.account_id
+        where cpgac.gh_id = #{ghId}
+          and cpgac.status = 1
+          and cpgp.scene = 0
+    </select>
+
 </mapper>

pom.xml

@@ -147,6 +147,12 @@
             <version>0.27.2-public</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.17.4</version>
+        </dependency>
+
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>