Merge branch '20250425-wyp-gzhPlan' into test

api-module/src/main/java/com/tzld/piaoquan/api/common/enums/contentplatform/ContentPlatformGzhPlanTypeEnum.java

@@ -0,0 +1,31 @@
+package com.tzld.piaoquan.api.common.enums.contentplatform;
+
+import lombok.Getter;
+
+@Getter
+public enum ContentPlatformGzhPlanTypeEnum {
+    AUTO_REPLY(0, "自动回复"),
+    FWH_PUSH(1, "服务号推送"),
+
+    other(999, "其他");
+
+    // 0-自动回复、1-服务号推送
+    private final int val;
+    private final String description;
+
+    ContentPlatformGzhPlanTypeEnum(int val, String description) {
+        this.val = val;
+        this.description = description;
+    }
+
+    public static ContentPlatformGzhPlanTypeEnum from(int val) {
+        for (ContentPlatformGzhPlanTypeEnum typeEnum : ContentPlatformGzhPlanTypeEnum.values()) {
+            if (typeEnum.getVal() == val) {
+                return typeEnum;
+            }
+        }
+        return other;
+    }
+
+
+}

api-module/src/main/java/com/tzld/piaoquan/api/common/enums/contentplatform/PublishStageEnum.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 @Getter
 public enum PublishStageEnum {
     PLATFORM(0, "平台发布"),
-    USER(1, "用户发布"),
+    USER(1, "用户获取路径"),
 
     other(999, "其他");
 

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

@@ -22,4 +22,6 @@ public interface ContentPlatformAccountService {
     List<ContentPlatformAccount> getAccountListByChannels(List<String> channels);
 
     ContentPlatformAccount getAccountByChannel(String channel);
+
+    ContentPlatformAccount getAccountById(Long id);
 }

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

@@ -34,4 +34,8 @@ public interface ContentPlatformCooperateAccountService {
     List<ContentPlatformGzhAccount> getCooperateAccountListByGhIds(Long loginAccountId, List<String> ghIds);
 
     void gzhImport(List<String> channels);
+
+    ContentPlatformGzhAccount getGzhAccount(String ghId);
+
+    List<ContentPlatformGzhAccount> getAccountListByCreatorId(Long creatorId);
 }

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

@@ -66,7 +66,11 @@ public interface ContentPlatformPlanService {
 
     void gzhPlanImport(List<String> channels);
 
+    void fwhPlanImport(List<String> channels);
+
     void qwPlanImport(List<String> channels);
 
     void gzhUpdateStagePublishStatus(Long id, Integer stagePublishStatus);
+
+    String getGzhChannel(String ghId);
 }

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

@@ -245,4 +245,9 @@ public class ContentPlatformAccountServiceImpl implements ContentPlatformAccount
         }
         return null;
     }
+
+    @Override
+    public ContentPlatformAccount getAccountById(Long id) {
+        return accountMapper.selectByPrimaryKey(id);
+    }
 }

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

@@ -237,4 +237,22 @@ public class ContentPlatformCooperateAccountServiceImpl implements ContentPlatfo
             }
         }
     }
+
+    @Override
+    public ContentPlatformGzhAccount getGzhAccount(String ghId) {
+        ContentPlatformGzhAccountExample example = new ContentPlatformGzhAccountExample();
+        example.createCriteria().andGhIdEqualTo(ghId).andStatusEqualTo(1);
+        List<ContentPlatformGzhAccount> accountList = gzhAccountMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(accountList)) {
+            return accountList.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public List<ContentPlatformGzhAccount> getAccountListByCreatorId(Long creatorId) {
+        ContentPlatformGzhAccountExample example = new ContentPlatformGzhAccountExample();
+        example.createCriteria().andCreateAccountIdEqualTo(creatorId).andStatusEqualTo(1);
+        return gzhAccountMapper.selectByExample(example);
+    }
 }

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

@@ -3,6 +3,7 @@ package com.tzld.piaoquan.api.service.contentplatform.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.tzld.piaoquan.api.common.enums.ExceptionEnum;
+import com.tzld.piaoquan.api.common.enums.contentplatform.ContentPlatformGzhPlanTypeEnum;
 import com.tzld.piaoquan.api.common.enums.contentplatform.PublishStageEnum;
 import com.tzld.piaoquan.api.common.enums.contentplatform.QwPlanTypeEnum;
 import com.tzld.piaoquan.api.common.exception.CommonException;
@@ -156,9 +157,11 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                     videoItemVO.setCustomCover(video.getCustomCover());
                     videoItemVO.setCustomCoverType(video.getCustomCoverType());
                     videoItemVO.setVideo(video.getVideo());
-                    CgiReplyBucketData bucketData = bucketDataMapByGhId.get(video.getVideoId());
-                    if (Objects.nonNull(bucketData)) {
-                        videoItemVO.setPageUrl(bucketData.getMiniPagePath());
+                    if (Objects.nonNull(bucketDataMapByGhId)) {
+                        CgiReplyBucketData bucketData = bucketDataMapByGhId.get(video.getVideoId());
+                        if (Objects.nonNull(bucketData)) {
+                            videoItemVO.setPageUrl(bucketData.getMiniPagePath());
+                        }
                     }
                     videoVOList.add(videoItemVO);
                 }
@@ -574,6 +577,22 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         return qwPlanVideoMapper.selectByExample(example);
     }
 
+    @Override
+    public String getGzhChannel(String ghId) {
+        ContentPlatformGzhAccount gzhAccount = cooperateAccountService.getGzhAccount(ghId);
+        if (Objects.nonNull(gzhAccount)) {
+            ContentPlatformAccount account = accountService.getAccountById(gzhAccount.getCreateAccountId());
+            ContentPlatformGzhPlanExample example = new ContentPlatformGzhPlanExample();
+            example.createCriteria().andCreateAccountIdEqualTo(account.getId()).andAccountIdEqualTo(gzhAccount.getId())
+                    .andStatusEqualTo(1).andTypeEqualTo(ContentPlatformGzhPlanTypeEnum.FWH_PUSH.getVal());
+            List<ContentPlatformGzhPlan> list = gzhPlanMapper.selectByExample(example);
+            if (CollectionUtils.isNotEmpty(list)) {
+                return account.getChannel();
+            }
+        }
+        return null;
+    }
+
     @Override
     public void gzhPlanImport(List<String> channels) {
         List<ContentPlatformAccount> accountList = accountService.getAccountListByChannels(channels);
@@ -599,9 +618,9 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                     continue;
                 }
                 gzhPlan.setAccountId(gzhAccount.getId());
-                gzhPlan.setType(0);
+                gzhPlan.setType(ContentPlatformGzhPlanTypeEnum.AUTO_REPLY.getVal());
                 gzhPlan.setScene(0);
-                gzhPlan.setSelectVideoType(1);
+                gzhPlan.setSelectVideoType(ghDetail.getStrategyStatus());
                 gzhPlan.setPublishStage(PublishStageEnum.USER.getVal());
                 if (StringUtils.hasText(gzhAccount.getExternalId())) {
                     aigcApiService.closeAccountMessagePublishPlan(gzhAccount.getExternalId());
@@ -636,6 +655,21 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         }
     }
 
+    @Override
+    public void fwhPlanImport(List<String> channels) {
+        List<ContentPlatformAccount> accountList = accountService.getAccountListByChannels(channels);
+        for (ContentPlatformAccount account : accountList) {
+            Long now = System.currentTimeMillis();
+            List<ContentPlatformGzhAccount> gzhAccountList = cooperateAccountService.getAccountListByCreatorId(account.getId());
+            for (ContentPlatformGzhAccount gzhAccount : gzhAccountList) {
+                if (!StringUtils.hasText(gzhAccount.getExternalId())) {
+                    continue;
+                }
+
+            }
+        }
+    }
+
     @Override
     public void qwPlanImport(List<String> channels) {
         List<AdPutFlowRecordTencent> list = new ArrayList<>();

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

@@ -183,7 +183,15 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
             SmallPageUrlDetail smallPageUrlDetail = new SmallPageUrlDetail();
             if (CollectionUtils.isEmpty(cgiReplyBucketData)) {
                 // 库里不存在，调用新生成
-                String response = touLiuHttpClient.sendAdFlowAddRequest(GET_SMALL_PAGE_URL, videoId, "dyyjs", channel, "自动", "公众号", "自动回复小程序", "位置" + sort, ghId);
+                String fwhChannel = contentPlatformPlanService.getGzhChannel(ghId);
+                String response;
+                if (StringUtils.isNotEmpty(fwhChannel)) {
+                    response = touLiuHttpClient.sendAdFlowAddRequest(GET_SMALL_PAGE_URL, videoId, "fwhdyy", fwhChannel,
+                            "自动", "公众号", "文章插小程序", "文字和小程序", ghId);
+                } else {
+                    response = touLiuHttpClient.sendAdFlowAddRequest(GET_SMALL_PAGE_URL, videoId, "dyyjs",
+                            channel, "自动", "公众号", "自动回复小程序", "位置" + sort, ghId);
+                }
                 JSONObject jsonObject = JSON.parseObject(response);
                 if (jsonObject.getInteger("code").equals(0)) {
                     smallPageUrlDetail = jsonObject.getObject("data", SmallPageUrlDetail.class);

api-module/src/test/java/com/tzld/piaoquan/api/ContentPlatformTest.java

@@ -32,6 +32,12 @@ public class ContentPlatformTest {
         planService.gzhPlanImport(channels);
     }
 
+    @Test
+    public void testImportFwhPlan() {
+        List<String> channels = Arrays.asList("ml","yy","zh","llf","wxm","hc","xs","wx","yqst","lq","bh","qd","bz","sw","pj","cy","xsy","ls","zqh");
+        planService.fwhPlanImport(channels);
+    }
+
     @Test
     public void testImportQwPlan() {
         List<String> channels = Arrays.asList("ml2025", "mj", "nh", "qc", "tczy", "wb", "xj", "wxm", "xycsd", "shy");