Merge branch '20250424-wyp-videoAgg' into test

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

@@ -36,6 +36,8 @@ public enum ExceptionEnum {
     GZH_PLAN_NOT_EXISTS(3001, "公众号计划不存在"),
     GZH_PLAN_VIDEO_SIZE_EXCEED(3002, "计划视频数量超过限制"),
     QW_PLAN_NOT_EXISTS(3003, "企微计划不存在"),
+    GZH_ACCOUNT_NOT_EXISTS(3004, "公众号不存在"),
+    GZH_ACCOUNT_NOT_AUTH(3005, "公众号未授权，无法使用平台发布"),
     ;
     private int code;
     private String msg;

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

@@ -5,7 +5,7 @@ import lombok.Getter;
 @Getter
 public enum QwPlanTypeEnum {
     GROUP(0, "社群"),
-    DAILY(1, "每日推送"),
+    REPLY(1, "自动回复"),
 
     other(999, "其他");
 
@@ -23,7 +23,15 @@ public enum QwPlanTypeEnum {
                 return typeEnum;
             }
         }
+        return other;
+    }
 
+    public static QwPlanTypeEnum from(String description) {
+        for (QwPlanTypeEnum typeEnum : QwPlanTypeEnum.values()) {
+            if (typeEnum.getDescription().equals(description)) {
+                return typeEnum;
+            }
+        }
         return other;
     }
 

api-module/src/main/java/com/tzld/piaoquan/api/component/AdApiService.java

@@ -0,0 +1,55 @@
+package com.tzld.piaoquan.api.component;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.tzld.piaoquan.api.model.bo.AdPutFlowRecordTencent;
+import com.tzld.piaoquan.growth.common.component.HttpPoolClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Component
+@Slf4j
+public class AdApiService {
+
+    @Autowired
+    private HttpPoolClient httpPoolClient;
+
+    @Value("${ad.api.host:https://testapi.piaoquantv.com/ad}")
+    private String adApiHost;
+
+
+    public Integer getPutFlowListTencentCount(String channel, Integer pageNum, Integer pageSize) {
+        String url = adApiHost + "/put/flow/list/tencent?videoId=&putScene=&channel="
+                + channel + "&currentPage=" + pageNum + "&pageSize=" + pageSize;
+        try {
+            String post = httpPoolClient.get(url);
+            JSONObject res = JSONObject.parseObject(post);
+            return res.getJSONObject("data").getInteger("totalSize");
+        } catch (Exception e) {
+            log.error("getPutFlowListTencentCount error", e);
+        }
+        return 0;
+    }
+
+    public List<AdPutFlowRecordTencent> getPutFlowListTencent(String channel, Integer pageNum, Integer pageSize) {
+        String url = adApiHost + "/put/flow/list/tencent?videoId=&putScene=&channel="
+                + channel + "&currentPage=" + pageNum + "&pageSize=" + pageSize;
+        try {
+            String post = httpPoolClient.get(url);
+            JSONObject res = JSONObject.parseObject(post);
+            JSONArray data = res.getJSONObject("data").getJSONArray("objs");
+            if (Objects.nonNull(data) && !data.isEmpty()) {
+                return data.toJavaList(AdPutFlowRecordTencent.class);
+            }
+        } catch (Exception e) {
+            log.error("getPutFlowListTencent error", e);
+        }
+        return new ArrayList<>();
+    }
+}

api-module/src/main/java/com/tzld/piaoquan/api/component/AigcApiService.java

@@ -101,16 +101,18 @@ public class AigcApiService {
             String post = httpPoolClient.post(url, getAigcPostParam(params));
             JSONObject res = JSONObject.parseObject(post);
             JSONObject data = res.getJSONObject("data");
-            return data.getString("id");
+            if (Objects.nonNull(data)) {
+                return data.getString("id");
+            }
         } catch (Exception e) {
-            log.error("getAccountDetail error", e);
+            log.error("getDetailByGhId error", e);
         }
         return null;
     }
 
-    public String createPublishPlan(String publishAccountId, String name) {
+    public String createPublishPlan(String publishAccountId, String name, String channel) {
         String url = aigcApiHost + "/publish/plan/save";
-        JSONObject params = getPublishPlanAddParam(publishAccountId, name);
+        JSONObject params = getPublishPlanAddParam(publishAccountId, name, channel);
         JSONObject res = null;
         try {
             String post = httpPoolClient.post(url, getAigcPostParam(params));
@@ -129,7 +131,7 @@ public class AigcApiService {
         return data.getString("id");
     }
 
-    private JSONObject getPublishPlanAddParam(String publishAccountId, String name) {
+    private JSONObject getPublishPlanAddParam(String publishAccountId, String name, String channel) {
         String dateStr = DateUtil.getCurrentDateStr("yyyyMMdd");
         JSONObject params = JSONObject.parseObject("{\n" +
                 "    \"accountIds\": [\n" +
@@ -141,7 +143,7 @@ public class AigcApiService {
                 "    \"contentModal\": 7,\n" +
                 "    \"douyinPublishAccoutSetting\": [],\n" +
                 "    \"filterMatchMode\": 1,\n" +
-                "    \"name\": \"自动回复-" + dateStr + "-" + name + "\",\n" +
+                "    \"name\": \"自动回复-" + dateStr + "-" + name + "-" + channel + "\",\n" +
                 "    \"publishAccoutJson\": \"\",\n" +
                 "    \"publishBgmType\": 0,\n" +
                 "    \"publishDate\": \"\",\n" +
@@ -175,7 +177,7 @@ public class AigcApiService {
                 "    \"gzhTriggerSyncFrequency\": 1,\n" +
                 "    \"gzhTriggerSendContentType\": 1,\n" +
                 "    \"gzhAutoReplyDelayFlag\": 1,\n" +
-                "    \"gzhAutoReplyDelayMillisecond\": 500,\n" +
+                "    \"gzhAutoReplyDelayMillisecond\": 1000,\n" +
                 "    \"pushContentSortingRules\": 1\n" +
                 "}");
         return params;
@@ -190,7 +192,7 @@ public class AigcApiService {
             String post = httpPoolClient.post(url, getAigcPostParam(params));
             JSONObject res = JSONObject.parseObject(post);
         } catch (Exception e) {
-            log.error("closePublishPlan error", e);
+            log.error("changePublishPlanStatus error", e);
         }
     }
 
@@ -213,8 +215,20 @@ public class AigcApiService {
             JSONObject res = JSONObject.parseObject(post);
             return res.getJSONArray("data").toJavaList(WxAccountDatastatVO.class);
         } catch (Exception e) {
-            log.error("closePublishPlan error", e);
+            log.error("getWxAccountDatastat error", e);
         }
         return null;
     }
+
+    public void closeAccountMessagePublishPlan(String publishAccountId) {
+        String url = aigcApiHost + "/publish/plan/closeAccountMessagePublishPlan";
+        JSONObject params = new JSONObject();
+        params.put("id", publishAccountId);
+        try {
+            String post = httpPoolClient.post(url, getAigcPostParam(params));
+            JSONObject res = JSONObject.parseObject(post);
+        } catch (Exception e) {
+            log.error("closeAccountMessagePublishPlan error", e);
+        }
+    }
 }

api-module/src/main/java/com/tzld/piaoquan/api/component/TouLiuHttpClient.java

@@ -74,8 +74,6 @@ public class TouLiuHttpClient {
                 videoDetail.setId(videoId);
                 videoDetail.setCover(shareImgPath);
                 videoDetail.setTitle(title);
-                videoDetail.setAuditStatus(jsonObject.getInteger("auditStatus"));
-                videoDetail.setRecommendStatus(jsonObject.getInteger("recommendStatus"));
                 map.put(videoId, videoDetail);
             }
         } catch (Exception e) {

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

@@ -23,6 +23,7 @@ import java.io.PrintWriter;
 import java.util.Map;
 
 import static com.tzld.piaoquan.growth.common.common.enums.CorpEnum.HNWQ;
+import static com.tzld.piaoquan.growth.common.common.enums.CorpEnum.YLQ;
 
 @Slf4j
 @RestController
@@ -127,4 +128,95 @@ public class TencentWeComController {
         String success = "success";
         return success;
     }
+
+
+    //优量圈验证接口
+    @GetMapping("/ylq/verify")
+    public void ylqVerifyGet(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            // 微信加密签名
+            String msgSignature = request.getParameter("msg_signature");
+            // 时间戳
+            String timestamp = request.getParameter("timestamp");
+            // 随机数
+            String nonce = request.getParameter("nonce");
+            // 随机字符串
+            // 如果是刷新，需返回原echostr
+            String echoStr = request.getParameter("echostr");
+            // 微信加密签名
+            WXBizMsgCrypt wxcpt = new WXBizMsgCrypt(WeComServerConstant.TOKEN,
+                    WeComServerConstant.ENCODING_AES_KEY,
+                    WeComServerConstant.CORP_ID);
+
+            String sEchoStr = ""; //需要返回的明文
+            PrintWriter out;
+
+            sEchoStr = wxcpt.VerifyURL(msgSignature, timestamp,
+                    nonce, echoStr);
+            log.info("verifyurl echostr: " + sEchoStr);
+
+            // 验证URL成功，将sEchoStr返回
+            out = response.getWriter();
+            out.print(sEchoStr);
+        } catch (Exception e) {
+            //验证URL失败，错误原因请查看异常
+            log.error("verifyGet error", e);
+        }
+
+    }
+
+    //优量圈回调消息接口
+    @PostMapping(value = "/ylq/verify")
+    public String ylqVerifyPost(HttpServletRequest request) {
+        try {
+            // 微信加密签名
+            String msg_signature = request.getParameter("msg_signature");
+            // 时间戳
+            String timestamp = request.getParameter("timestamp");
+            // 随机数
+            String nonce = request.getParameter("nonce");
+
+            String id = WeComServerConstant.CORP_ID;
+
+            WXBizMsgCrypt wxcpt = new WXBizMsgCrypt(WeComServerConstant.TOKEN, WeComServerConstant.ENCODING_AES_KEY, id);
+
+            StringBuilder postData = new StringBuilder();   // 密文，对应POST请求的数据
+            //1.获取加密的请求消息：使用输入流获得加密请求消息postData
+            ServletInputStream in = request.getInputStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+
+            String tempStr = "";   //作为输出字符串的临时串，用于判断是否读取完毕
+            while (null != (tempStr = reader.readLine())) {
+                postData.append(tempStr);
+            }
+
+            String suiteXml = wxcpt.DecryptMsg(msg_signature, timestamp, nonce, postData.toString());
+            log.info("suiteXml: " + suiteXml);
+
+            Map suiteMap = WxUtil.transferXmlToMap(suiteXml);
+            log.info("suiteMap = {}", JSONObject.toJSONString(suiteMap));
+            if (suiteMap != null) {
+                String changeType = (String) suiteMap.get("ChangeType");
+                if (StringUtils.isNotEmpty(changeType) && changeType.equals("add_external_contact")) {
+                    String userId = (String) suiteMap.get("UserID");
+                    String externalUserId = (String) suiteMap.get("ExternalUserID");
+                    String welcomeCode = (String) suiteMap.get("WelcomeCode");
+                    log.info("addStaffWithUser userId={} externalUserId={}", userId, externalUserId);
+                    weComUserService.addStaffWithUser(externalUserId, userId, YLQ.getId());
+                    weComAutoReply.AutoReplyMessage(welcomeCode, externalUserId, userId, YLQ.getId());
+                }
+
+                if (StringUtils.isNotEmpty(changeType) && changeType.equals("del_follow_user")) {
+                    String userId = (String) suiteMap.get("UserID");
+                    String externalUserId = (String) suiteMap.get("ExternalUserID");
+                    log.info("delStaffWithUser userId={} externalUserId={}", userId, externalUserId);
+                    weComUserService.delStaffWithUser(externalUserId, userId, YLQ.getId(), System.currentTimeMillis());
+                }
+            }
+        } catch (Exception e) {
+            log.error("verifyPost error", e);
+        }
+        String success = "success";
+        return success;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.api.controller.contentplatform;
 
+import com.tzld.piaoquan.api.annotation.JwtIgnore;
 import com.tzld.piaoquan.api.job.ContentPlatformVideoJob;
 import com.tzld.piaoquan.api.model.param.IdParam;
 import com.tzld.piaoquan.api.model.param.contentplatform.*;
@@ -89,7 +90,8 @@ public class ContentPlatformPlanController {
         return CommonResponse.success(planService.getSharePic(pageUrl));
     }
 
-    @ApiOperation(value = "同步每日top1000视频")
+    @ApiOperation(value = "同步最近14日top1000视频")
+    @JwtIgnore
     @PostMapping("/syncContentPlatformVideoJob")
     public CommonResponse<Void> syncContentPlatformVideoJob(@RequestBody QwPlanSaveParam param) {
         videoJob.syncContentPlatformVideoJob(null);
@@ -97,6 +99,7 @@ public class ContentPlatformPlanController {
     }
 
     @ApiOperation(value = "检查视频状态")
+    @JwtIgnore
     @PostMapping("/checkContentPlatformVideoStatusJob")
     public CommonResponse<Void> checkContentPlatformVideoStatusJob(@RequestBody QwPlanSaveParam param) {
         videoJob.checkContentPlatformVideoStatusJob(null);

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

@@ -0,0 +1,30 @@
+package com.tzld.piaoquan.api.dao.mapper.contentplatform;
+
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAggExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ContentPlatformVideoAggMapper {
+    long countByExample(ContentPlatformVideoAggExample example);
+
+    int deleteByExample(ContentPlatformVideoAggExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(ContentPlatformVideoAgg record);
+
+    int insertSelective(ContentPlatformVideoAgg record);
+
+    List<ContentPlatformVideoAgg> selectByExample(ContentPlatformVideoAggExample example);
+
+    ContentPlatformVideoAgg selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") ContentPlatformVideoAgg record, @Param("example") ContentPlatformVideoAggExample example);
+
+    int updateByExample(@Param("record") ContentPlatformVideoAgg record, @Param("example") ContentPlatformVideoAggExample example);
+
+    int updateByPrimaryKeySelective(ContentPlatformVideoAgg record);
+
+    int updateByPrimaryKey(ContentPlatformVideoAgg record);
+}

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

@@ -3,10 +3,7 @@ package com.tzld.piaoquan.api.dao.mapper.contentplatform.ext;
 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 com.tzld.piaoquan.api.model.po.contentplatform.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,17 +27,21 @@ public interface ContentPlatformPlanMapperExt {
 
     String getVideoMaxDt();
 
-    int getVideoCount(@Param("param") VideoContentListParam param, @Param("dt") String dt);
+    int getVideoCount(@Param("param") VideoContentListParam param, @Param("dt") String dt,
+                      @Param("minScore") Double minScore);
 
     List<String> getVideoCategoryList(@Param("dt") String dt);
 
     List<ContentPlatformVideo> getVideoList(@Param("param") VideoContentListParam param,
                                             @Param("dt") String dt,
+                                            @Param("minScore") Double minScore,
                                             @Param("offset") int offset,
                                             @Param("pageSize") Integer pageSize);
 
     void batchInsertContentPlatformVideo(@Param("records") List<ContentPlatformVideo> saveList);
 
+    void batchInsertContentPlatformVideoAgg(@Param("records") List<ContentPlatformVideoAgg> saveList);
+
     int getQwPlanCount(@Param("param") QwPlanListParam param,
                        @Param("createAccountId") Long createAccountId);
 
@@ -48,6 +49,7 @@ public interface ContentPlatformPlanMapperExt {
                                               @Param("createAccountId") Long createAccountId,
                                               @Param("offset") int offset,
                                               @Param("pageSize") Integer pageSize);
+
     void batchInsertQwPlan(@Param("records") List<ContentPlatformQwPlan> saveList);
 
     void insertQwPlanReturnId(@Param("record") ContentPlatformQwPlan qwPlan);
@@ -55,4 +57,8 @@ public interface ContentPlatformPlanMapperExt {
     List<ContentPlatformGzhPlanVideo> getGzhPlanVideoListByCooperateAccountId(@Param("ghId") String ghId);
 
     void updateVideoStatus(@Param("videoId") Long videoId, @Param("now") Long now);
+
+    void updateVideoAggStatus(@Param("videoId") Long videoId, @Param("now") Long now);
+
+    List<ContentPlatformVideoAgg> getVideoAggList(List<String> dtList);
 }

api-module/src/main/java/com/tzld/piaoquan/api/job/ContentPlatformDatastatJob.java

@@ -106,6 +106,9 @@ public class ContentPlatformDatastatJob {
                     item.setFansIncreaseCount(wxAccountDatastatVO.getFansIncreaseCount());
                 }
                 List<Long> planIdList = gzhPlanMap.get(gzhAccount.getId());
+                if (CollectionUtils.isEmpty(planIdList)) {
+                    continue;
+                }
                 Double score = 0.0;
                 int size = 0;
                 for (Long planId : planIdList) {

api-module/src/main/java/com/tzld/piaoquan/api/job/ContentPlatformVideoJob.java

@@ -2,12 +2,15 @@ package com.tzld.piaoquan.api.job;
 
 import com.aliyun.odps.data.Record;
 import com.google.common.collect.Lists;
-import com.tzld.piaoquan.api.component.TouLiuHttpClient;
+import com.tzld.piaoquan.api.dao.mapper.contentplatform.ContentPlatformVideoAggMapper;
 import com.tzld.piaoquan.api.dao.mapper.contentplatform.ContentPlatformVideoMapper;
 import com.tzld.piaoquan.api.dao.mapper.contentplatform.ext.ContentPlatformPlanMapperExt;
-import com.tzld.piaoquan.api.model.bo.VideoDetail;
 import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideo;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAggExample;
 import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoExample;
+import com.tzld.piaoquan.growth.common.model.bo.VideoDetail;
+import com.tzld.piaoquan.growth.common.service.MessageAttachmentService;
 import com.tzld.piaoquan.growth.common.utils.DateUtil;
 import com.tzld.piaoquan.growth.common.utils.OdpsUtil;
 import com.xxl.job.core.biz.model.ReturnT;
@@ -17,10 +20,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -34,74 +34,134 @@ public class ContentPlatformVideoJob {
     private ContentPlatformVideoMapper videoMapper;
 
     @Autowired
-    private TouLiuHttpClient touLiuHttpClient;
+    private ContentPlatformVideoAggMapper videoAggMapper;
+
+    @Autowired
+    private MessageAttachmentService messageAttachmentService;
 
     @XxlJob("syncContentPlatformVideoJob")
     public ReturnT<String> syncContentPlatformVideoJob(String param) {
-        String dt = DateUtil.getBeforeDayDateString("yyyyMMdd");
-        long videoCount = getVideoCount(dt);
-        if (videoCount > 0) {
-            return ReturnT.SUCCESS;
+        String aggDt = DateUtil.getBeforeDayDateString("yyyyMMdd");
+        List<String> dtList = DateUtil.getBeforeDays(14);
+        // 轮询查询大数据获取最近14天视频
+        for (String dt : dtList) {
+            long videoCount = getVideoCount(dt);
+            if (videoCount > 0) {
+                continue;
+            }
+            String sql = String.format("SELECT * FROM loghubods.wecom_cooperation_video_candidate_pool WHERE dt=%s;", dt);
+            List<Record> dataList = OdpsUtil.getOdpsData(sql);
+            Long now = System.currentTimeMillis();
+            if (CollectionUtils.isNotEmpty(dataList)) {
+                List<ContentPlatformVideo> saveList = new ArrayList<>();
+                for (Record record : dataList) {
+                    ContentPlatformVideo item = new ContentPlatformVideo();
+                    Long videoId = Long.parseLong((String) record.get(0));
+                    String category = (String) record.get(1);
+                    String title = (String) record.get(2);
+                    String videoUrl = (String) record.get(3);
+                    Double score = Double.parseDouble((String) record.get(4));
+                    item.setDt(dt);
+                    item.setVideoId(videoId);
+                    item.setCategory(category);
+                    item.setTitle(title);
+                    item.setVideo(videoUrl);
+                    item.setScore(score);
+                    item.setCreateTimestamp(now);
+                    saveList.add(item);
+                }
+                // 获取视频封面
+                for (List<ContentPlatformVideo> partition : Lists.partition(saveList, 20)) {
+                    List<Long> videoIds = partition.stream().map(ContentPlatformVideo::getVideoId).distinct().collect(Collectors.toList());
+                    Map<Long, VideoDetail> coverMap = messageAttachmentService.getVideoDetail(new HashSet<>(videoIds));
+                    for (ContentPlatformVideo item : partition) {
+                        VideoDetail detail = coverMap.get(item.getVideoId());
+                        if (Objects.nonNull(detail)) {
+                            String cover = detail.getCover().substring(0, detail.getCover().indexOf("/watermark"));
+                            item.setCover(cover);
+                            if (detail.getAuditStatus() != 5 || detail.getRecommendStatus() != -6) {
+                                item.setStatus(0);
+                            }
+                        }
+                    }
+                }
+                // save
+                if (CollectionUtils.isNotEmpty(saveList)) {
+                    planMapperExt.batchInsertContentPlatformVideo(saveList);
+                }
+            }
         }
-        String sql = String.format("SELECT * FROM loghubods.wecom_cooperation_video_candidate_pool WHERE dt=%s;", dt);
-        List<Record> dataList = OdpsUtil.getOdpsData(sql);
-        Long now = System.currentTimeMillis();
-        if (CollectionUtils.isNotEmpty(dataList)) {
-            List<ContentPlatformVideo> saveList = new ArrayList<>();
-            for (Record record : dataList) {
-                ContentPlatformVideo item = new ContentPlatformVideo();
-                Long videoId = Long.parseLong((String) record.get(0));
-                String category = (String) record.get(1);
-                String title = (String) record.get(2);
-                String videoUrl = (String) record.get(3);
-                Double score = Double.parseDouble((String) record.get(4));
-                item.setDt(dt);
-                item.setVideoId(videoId);
-                item.setCategory(category);
-                item.setTitle(title);
-                item.setVideo(videoUrl);
-                item.setScore(score);
-                item.setCreateTimestamp(now);
-                saveList.add(item);
+        // 更新封面
+        List<ContentPlatformVideo> nullCoverVideoList = getVideoNullCover();
+        if (CollectionUtils.isNotEmpty(nullCoverVideoList)) {
+            for (List<ContentPlatformVideo> partition : Lists.partition(nullCoverVideoList, 20)) {
+                List<Long> videoIds = partition.stream().map(ContentPlatformVideo::getVideoId).distinct().collect(Collectors.toList());
+                Map<Long, VideoDetail> coverMap = messageAttachmentService.getVideoDetail(new HashSet<>(videoIds));
+                for (ContentPlatformVideo item : partition) {
+                    VideoDetail detail = coverMap.get(item.getVideoId());
+                    if (Objects.isNull(detail)) {
+                        continue;
+                    }
+                    String cover = detail.getCover().substring(0, detail.getCover().indexOf("/watermark"));
+                    item.setCover(cover);
+                    if (detail.getAuditStatus() != 5 || detail.getRecommendStatus() != -6) {
+                        item.setStatus(0);
+                    }
+                    videoMapper.updateByPrimaryKeySelective(item);
+                }
             }
-            if (CollectionUtils.isNotEmpty(saveList)) {
-                planMapperExt.batchInsertContentPlatformVideo(saveList);
+        }
+        // 聚合最近14天视频
+        List<ContentPlatformVideoAgg> saveAggList = planMapperExt.getVideoAggList(dtList);
+        if (CollectionUtils.isNotEmpty(saveAggList)) {
+            Long now = System.currentTimeMillis();
+            for (ContentPlatformVideoAgg item : saveAggList) {
+                item.setDt(aggDt);
+                item.setCreateTimestamp(now);
             }
+            planMapperExt.batchInsertContentPlatformVideoAgg(saveAggList);
         }
         return ReturnT.SUCCESS;
     }
 
+    private List<ContentPlatformVideo> getVideoNullCover() {
+        ContentPlatformVideoExample example = new ContentPlatformVideoExample();
+        example.createCriteria().andCoverIsNull();
+        return videoMapper.selectByExample(example);
+    }
+
     private long getVideoCount(String dt) {
         ContentPlatformVideoExample example = new ContentPlatformVideoExample();
         example.createCriteria().andDtEqualTo(dt);
         return videoMapper.countByExample(example);
     }
+
     @XxlJob("checkContentPlatformVideoStatusJob")
     public ReturnT<String> checkContentPlatformVideoStatusJob(String param) {
         String dt = planMapperExt.getVideoMaxDt();
-        List<ContentPlatformVideo> videoList = getVideoListByDt(dt);
+        List<ContentPlatformVideoAgg> videoList = getVideoListByDt(dt);
         Long now = System.currentTimeMillis();
-        List<Long> videoIds = videoList.stream().map(ContentPlatformVideo::getVideoId).collect(Collectors.toList());
-        Map<Long, VideoDetail> videoDetailMap = new HashMap<>();
-        for (List<Long> partitionVideoIds : Lists.partition(videoIds, 20)) {
-            videoDetailMap.putAll(touLiuHttpClient.getVideoDetailRequest(partitionVideoIds));
-        }
-        for (ContentPlatformVideo video : videoList) {
-            VideoDetail videoDetail = videoDetailMap.get(video.getVideoId());
-            if (videoDetail == null) {
-                continue;
-            }
-            if (videoDetail.getAuditStatus() != 5 || videoDetail.getRecommendStatus() != -6) {
-                planMapperExt.updateVideoStatus(video.getVideoId(), now);
+        for (List<ContentPlatformVideoAgg> partition : Lists.partition(videoList, 20)) {
+            List<Long> videoIds = partition.stream().map(ContentPlatformVideoAgg::getVideoId).collect(Collectors.toList());
+            Map<Long, VideoDetail> videoDetailMap = messageAttachmentService.getVideoDetail(new HashSet<>(videoIds));
+            for (ContentPlatformVideoAgg video : partition) {
+                VideoDetail videoDetail = videoDetailMap.get(video.getVideoId());
+                if (videoDetail == null) {
+                    continue;
+                }
+                if (videoDetail.getAuditStatus() != 5 || videoDetail.getRecommendStatus() != -6) {
+                    planMapperExt.updateVideoStatus(video.getVideoId(), now);
+                    planMapperExt.updateVideoAggStatus(video.getVideoId(), now);
+                }
             }
         }
         return ReturnT.SUCCESS;
     }
 
-    private List<ContentPlatformVideo> getVideoListByDt(String dt) {
-        ContentPlatformVideoExample example = new ContentPlatformVideoExample();
+    private List<ContentPlatformVideoAgg> getVideoListByDt(String dt) {
+        ContentPlatformVideoAggExample example = new ContentPlatformVideoAggExample();
         example.createCriteria().andDtEqualTo(dt).andStatusEqualTo(1);
-        return videoMapper.selectByExample(example);
+        return videoAggMapper.selectByExample(example);
     }
 
 }

api-module/src/main/java/com/tzld/piaoquan/api/model/bo/AdPutFlowRecordTencent.java

@@ -0,0 +1,50 @@
+package com.tzld.piaoquan.api.model.bo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class AdPutFlowRecordTencent {
+
+    private Long id;
+
+    private Long videoId;
+
+    private String videoTitle;
+
+    private String putScene;
+
+    private String channel;
+
+    private String remark;
+
+    private String url;
+
+    private String sharePic;
+
+    private String rootSourceId;
+
+    private String putTypeOne;
+
+    private String putTypeTwo;
+
+    private String putTypeThree;
+
+    private String testId;
+
+    private String putCarrierId;
+
+    private String putStartDate;
+
+    private Integer isDelete;
+
+    private String createUser;
+
+    private String updateUser;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/bo/VideoDetail.java

@@ -10,10 +10,4 @@ public class VideoDetail {
     private String cover;
 
     private String title;
-
-    // 审核状态  1 审核中，2 不通过 3 待修改，4 自己可见 5 通过
-    private Integer auditStatus;
-
-    // 推荐状态（0：不可搜，-6：待推荐，1：普通推荐，10：编辑推荐,-7:可搜索）
-    private Integer recommendStatus;
 }

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

@@ -0,0 +1,11 @@
+package com.tzld.piaoquan.api.model.param.contentplatform;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CooperateAccountImportParam {
+    private String channel;
+    private List<String> ghIds;
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformVideo.java

@@ -11,6 +11,8 @@ public class ContentPlatformVideo {
 
     private String title;
 
+    private String cover;
+
     private String video;
 
     private Double score;
@@ -61,6 +63,14 @@ public class ContentPlatformVideo {
         this.title = title;
     }
 
+    public String getCover() {
+        return cover;
+    }
+
+    public void setCover(String cover) {
+        this.cover = cover;
+    }
+
     public String getVideo() {
         return video;
     }
@@ -112,6 +122,7 @@ public class ContentPlatformVideo {
         sb.append(", videoId=").append(videoId);
         sb.append(", category=").append(category);
         sb.append(", title=").append(title);
+        sb.append(", cover=").append(cover);
         sb.append(", video=").append(video);
         sb.append(", score=").append(score);
         sb.append(", status=").append(status);

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformVideoAgg.java

@@ -0,0 +1,134 @@
+package com.tzld.piaoquan.api.model.po.contentplatform;
+
+public class ContentPlatformVideoAgg {
+    private Long id;
+
+    private String dt;
+
+    private Long videoId;
+
+    private String category;
+
+    private String title;
+
+    private String cover;
+
+    private String video;
+
+    private Double score;
+
+    private Integer status;
+
+    private Long createTimestamp;
+
+    private Long updateTimestamp;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getDt() {
+        return dt;
+    }
+
+    public void setDt(String dt) {
+        this.dt = dt;
+    }
+
+    public Long getVideoId() {
+        return videoId;
+    }
+
+    public void setVideoId(Long videoId) {
+        this.videoId = videoId;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCover() {
+        return cover;
+    }
+
+    public void setCover(String cover) {
+        this.cover = cover;
+    }
+
+    public String getVideo() {
+        return video;
+    }
+
+    public void setVideo(String video) {
+        this.video = video;
+    }
+
+    public Double getScore() {
+        return score;
+    }
+
+    public void setScore(Double score) {
+        this.score = score;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Long getCreateTimestamp() {
+        return createTimestamp;
+    }
+
+    public void setCreateTimestamp(Long createTimestamp) {
+        this.createTimestamp = createTimestamp;
+    }
+
+    public Long getUpdateTimestamp() {
+        return updateTimestamp;
+    }
+
+    public void setUpdateTimestamp(Long updateTimestamp) {
+        this.updateTimestamp = updateTimestamp;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", dt=").append(dt);
+        sb.append(", videoId=").append(videoId);
+        sb.append(", category=").append(category);
+        sb.append(", title=").append(title);
+        sb.append(", cover=").append(cover);
+        sb.append(", video=").append(video);
+        sb.append(", score=").append(score);
+        sb.append(", status=").append(status);
+        sb.append(", createTimestamp=").append(createTimestamp);
+        sb.append(", updateTimestamp=").append(updateTimestamp);
+        sb.append("]");
+        return sb.toString();
+    }
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformVideoAggExample.java

@@ -0,0 +1,921 @@
+package com.tzld.piaoquan.api.model.po.contentplatform;
+
+import com.tzld.piaoquan.growth.common.utils.page.Page;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ContentPlatformVideoAggExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    protected Page page;
+
+    public ContentPlatformVideoAggExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    public void setPage(Page page) {
+        this.page=page;
+    }
+
+    public Page getPage() {
+        return page;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtIsNull() {
+            addCriterion("dt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtIsNotNull() {
+            addCriterion("dt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtEqualTo(String value) {
+            addCriterion("dt =", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotEqualTo(String value) {
+            addCriterion("dt <>", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtGreaterThan(String value) {
+            addCriterion("dt >", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtGreaterThanOrEqualTo(String value) {
+            addCriterion("dt >=", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtLessThan(String value) {
+            addCriterion("dt <", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtLessThanOrEqualTo(String value) {
+            addCriterion("dt <=", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtLike(String value) {
+            addCriterion("dt like", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotLike(String value) {
+            addCriterion("dt not like", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtIn(List<String> values) {
+            addCriterion("dt in", values, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotIn(List<String> values) {
+            addCriterion("dt not in", values, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtBetween(String value1, String value2) {
+            addCriterion("dt between", value1, value2, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotBetween(String value1, String value2) {
+            addCriterion("dt not between", value1, value2, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdIsNull() {
+            addCriterion("video_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdIsNotNull() {
+            addCriterion("video_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdEqualTo(Long value) {
+            addCriterion("video_id =", value, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdNotEqualTo(Long value) {
+            addCriterion("video_id <>", value, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdGreaterThan(Long value) {
+            addCriterion("video_id >", value, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("video_id >=", value, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdLessThan(Long value) {
+            addCriterion("video_id <", value, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdLessThanOrEqualTo(Long value) {
+            addCriterion("video_id <=", value, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdIn(List<Long> values) {
+            addCriterion("video_id in", values, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdNotIn(List<Long> values) {
+            addCriterion("video_id not in", values, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdBetween(Long value1, Long value2) {
+            addCriterion("video_id between", value1, value2, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIdNotBetween(Long value1, Long value2) {
+            addCriterion("video_id not between", value1, value2, "videoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNull() {
+            addCriterion("category is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIsNotNull() {
+            addCriterion("category is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryEqualTo(String value) {
+            addCriterion("category =", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotEqualTo(String value) {
+            addCriterion("category <>", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThan(String value) {
+            addCriterion("category >", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryGreaterThanOrEqualTo(String value) {
+            addCriterion("category >=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThan(String value) {
+            addCriterion("category <", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLessThanOrEqualTo(String value) {
+            addCriterion("category <=", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryLike(String value) {
+            addCriterion("category like", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotLike(String value) {
+            addCriterion("category not like", value, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIn(List<String> values) {
+            addCriterion("category in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotIn(List<String> values) {
+            addCriterion("category not in", values, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryBetween(String value1, String value2) {
+            addCriterion("category between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryNotBetween(String value1, String value2) {
+            addCriterion("category not between", value1, value2, "category");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverIsNull() {
+            addCriterion("cover is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverIsNotNull() {
+            addCriterion("cover is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverEqualTo(String value) {
+            addCriterion("cover =", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotEqualTo(String value) {
+            addCriterion("cover <>", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverGreaterThan(String value) {
+            addCriterion("cover >", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverGreaterThanOrEqualTo(String value) {
+            addCriterion("cover >=", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverLessThan(String value) {
+            addCriterion("cover <", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverLessThanOrEqualTo(String value) {
+            addCriterion("cover <=", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverLike(String value) {
+            addCriterion("cover like", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotLike(String value) {
+            addCriterion("cover not like", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverIn(List<String> values) {
+            addCriterion("cover in", values, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotIn(List<String> values) {
+            addCriterion("cover not in", values, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverBetween(String value1, String value2) {
+            addCriterion("cover between", value1, value2, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotBetween(String value1, String value2) {
+            addCriterion("cover not between", value1, value2, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIsNull() {
+            addCriterion("video is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIsNotNull() {
+            addCriterion("video is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoEqualTo(String value) {
+            addCriterion("video =", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoNotEqualTo(String value) {
+            addCriterion("video <>", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoGreaterThan(String value) {
+            addCriterion("video >", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoGreaterThanOrEqualTo(String value) {
+            addCriterion("video >=", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoLessThan(String value) {
+            addCriterion("video <", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoLessThanOrEqualTo(String value) {
+            addCriterion("video <=", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoLike(String value) {
+            addCriterion("video like", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoNotLike(String value) {
+            addCriterion("video not like", value, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoIn(List<String> values) {
+            addCriterion("video in", values, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoNotIn(List<String> values) {
+            addCriterion("video not in", values, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoBetween(String value1, String value2) {
+            addCriterion("video between", value1, value2, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andVideoNotBetween(String value1, String value2) {
+            addCriterion("video not between", value1, value2, "video");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreIsNull() {
+            addCriterion("score is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreIsNotNull() {
+            addCriterion("score is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreEqualTo(Double value) {
+            addCriterion("score =", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreNotEqualTo(Double value) {
+            addCriterion("score <>", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreGreaterThan(Double value) {
+            addCriterion("score >", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreGreaterThanOrEqualTo(Double value) {
+            addCriterion("score >=", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreLessThan(Double value) {
+            addCriterion("score <", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreLessThanOrEqualTo(Double value) {
+            addCriterion("score <=", value, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreIn(List<Double> values) {
+            addCriterion("score in", values, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreNotIn(List<Double> values) {
+            addCriterion("score not in", values, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreBetween(Double value1, Double value2) {
+            addCriterion("score between", value1, value2, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andScoreNotBetween(Double value1, Double value2) {
+            addCriterion("score not between", value1, value2, "score");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIsNull() {
+            addCriterion("create_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIsNotNull() {
+            addCriterion("create_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampEqualTo(Long value) {
+            addCriterion("create_timestamp =", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotEqualTo(Long value) {
+            addCriterion("create_timestamp <>", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampGreaterThan(Long value) {
+            addCriterion("create_timestamp >", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_timestamp >=", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampLessThan(Long value) {
+            addCriterion("create_timestamp <", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("create_timestamp <=", value, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampIn(List<Long> values) {
+            addCriterion("create_timestamp in", values, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotIn(List<Long> values) {
+            addCriterion("create_timestamp not in", values, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampBetween(Long value1, Long value2) {
+            addCriterion("create_timestamp between", value1, value2, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("create_timestamp not between", value1, value2, "createTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIsNull() {
+            addCriterion("update_timestamp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIsNotNull() {
+            addCriterion("update_timestamp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampEqualTo(Long value) {
+            addCriterion("update_timestamp =", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotEqualTo(Long value) {
+            addCriterion("update_timestamp <>", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampGreaterThan(Long value) {
+            addCriterion("update_timestamp >", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_timestamp >=", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampLessThan(Long value) {
+            addCriterion("update_timestamp <", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampLessThanOrEqualTo(Long value) {
+            addCriterion("update_timestamp <=", value, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampIn(List<Long> values) {
+            addCriterion("update_timestamp in", values, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotIn(List<Long> values) {
+            addCriterion("update_timestamp not in", values, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampBetween(Long value1, Long value2) {
+            addCriterion("update_timestamp between", value1, value2, "updateTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimestampNotBetween(Long value1, Long value2) {
+            addCriterion("update_timestamp not between", value1, value2, "updateTimestamp");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

api-module/src/main/java/com/tzld/piaoquan/api/model/po/contentplatform/ContentPlatformVideoExample.java

@@ -445,6 +445,76 @@ public class ContentPlatformVideoExample {
             return (Criteria) this;
         }
 
+        public Criteria andCoverIsNull() {
+            addCriterion("cover is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverIsNotNull() {
+            addCriterion("cover is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverEqualTo(String value) {
+            addCriterion("cover =", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotEqualTo(String value) {
+            addCriterion("cover <>", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverGreaterThan(String value) {
+            addCriterion("cover >", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverGreaterThanOrEqualTo(String value) {
+            addCriterion("cover >=", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverLessThan(String value) {
+            addCriterion("cover <", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverLessThanOrEqualTo(String value) {
+            addCriterion("cover <=", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverLike(String value) {
+            addCriterion("cover like", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotLike(String value) {
+            addCriterion("cover not like", value, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverIn(List<String> values) {
+            addCriterion("cover in", values, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotIn(List<String> values) {
+            addCriterion("cover not in", values, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverBetween(String value1, String value2) {
+            addCriterion("cover between", value1, value2, "cover");
+            return (Criteria) this;
+        }
+
+        public Criteria andCoverNotBetween(String value1, String value2) {
+            addCriterion("cover not between", value1, value2, "cover");
+            return (Criteria) this;
+        }
+
         public Criteria andVideoIsNull() {
             addCriterion("video is null");
             return (Criteria) this;

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

@@ -6,6 +6,8 @@ import com.tzld.piaoquan.growth.common.common.base.CommonResponse;
 import com.tzld.piaoquan.growth.common.model.po.GhDetail;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
 
+import java.util.List;
+
 public interface GhDetailService {
 
     CommonResponse<Page<GhDetailVo>> getGhDetailList(Integer pageNum, Integer pageSize, String accountId, String accountName);
@@ -17,4 +19,6 @@ public interface GhDetailService {
     CommonResponse<Void> deleteDetail(Long id);
 
     GhDetail getGhDetailByGhIdType(String ghId, Integer type);
+
+    List<GhDetail> getByChannel(String channel);
 }

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

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.api.service.contentplatform;
 
 import com.tzld.piaoquan.api.model.param.contentplatform.*;
+import com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformAccount;
 import com.tzld.piaoquan.api.model.vo.contentplatform.AccountLoginVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.AccountVO;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
@@ -17,4 +18,8 @@ public interface ContentPlatformAccountService {
     void accountForbidden(AccountForbiddenParam param);
 
     void saveAccount(AccountSaveParam param);
+
+    List<ContentPlatformAccount> getAccountListByChannels(List<String> channels);
+
+    ContentPlatformAccount getAccountByChannel(String channel);
 }

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

@@ -30,4 +30,8 @@ public interface ContentPlatformCooperateAccountService {
     List<ContentPlatformGzhAccount> getAccountListByIds(List<Long> ids);
 
     ContentPlatformGzhAccount getById(Long id);
+
+    List<ContentPlatformGzhAccount> getCooperateAccountListByGhIds(Long loginAccountId, List<String> ghIds);
+
+    void gzhImport(List<String> channels);
 }

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

@@ -44,6 +44,8 @@ public interface ContentPlatformPlanService {
 
     List<ContentPlatformGzhPlan> getGzhPlanListByCooperateAccountId(Long accountId);
 
+    List<ContentPlatformGzhPlan> getGzhPlanListByCreateAccountId(Long createAccountId);
+
     List<ContentPlatformGzhPlan> getGzhPlanListByCooperateAccountIds(List<Long> accountIds);
 
     List<ContentPlatformGzhPlanVideo> getGzhPlanVideoListByCooperateAccountId(String ghId);
@@ -61,4 +63,8 @@ public interface ContentPlatformPlanService {
     void gzhPlanDelete(Long id);
 
     void qwPlanDelete(Long id);
+
+    void gzhPlanImport(List<String> channels);
+
+    void qwPlanImport(List<String> channels);
 }

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

@@ -217,4 +217,23 @@ public class ContentPlatformAccountServiceImpl implements ContentPlatformAccount
         BeanUtils.copyProperties(account, loginVO);
         saveTokenToRedis(loginVO, account.getToken(), account.getToken());
     }
+
+
+    @Override
+    public List<ContentPlatformAccount> getAccountListByChannels(List<String> channels) {
+        ContentPlatformAccountExample example = new ContentPlatformAccountExample();
+        example.createCriteria().andChannelIn(channels);
+        return accountMapper.selectByExample(example);
+    }
+
+    @Override
+    public ContentPlatformAccount getAccountByChannel(String channel) {
+        ContentPlatformAccountExample example = new ContentPlatformAccountExample();
+        example.createCriteria().andChannelEqualTo(channel);
+        List<ContentPlatformAccount> list = accountMapper.selectByExample(example);
+        if (CollectionUtils.isNotEmpty(list)) {
+            return list.get(0);
+        }
+        return null;
+    }
 }

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

@@ -18,20 +18,24 @@ import com.tzld.piaoquan.api.model.vo.contentplatform.CooperateAccountItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GenerateQrcodeVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GzhAccountItem;
 import com.tzld.piaoquan.api.model.vo.contentplatform.GzhAuthResultVO;
+import com.tzld.piaoquan.api.service.GhDetailService;
+import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformAccountService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformCooperateAccountService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
+import com.tzld.piaoquan.growth.common.model.po.GhDetail;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
+@Slf4j
 public class ContentPlatformCooperateAccountServiceImpl implements ContentPlatformCooperateAccountService {
 
     @Autowired
@@ -41,7 +45,11 @@ public class ContentPlatformCooperateAccountServiceImpl implements ContentPlatfo
     @Autowired
     private ContentPlatformGzhAccountMapperExt gzhAccountMapperExt;
     @Autowired
+    private GhDetailService ghDetailService;
+    @Autowired
     private ContentPlatformPlanService planService;
+    @Autowired
+    private ContentPlatformAccountService accountService;
 
     @Override
     public Page<CooperateAccountItemVO> gzhList(CooperateAccountListParam param) {
@@ -174,4 +182,57 @@ public class ContentPlatformCooperateAccountServiceImpl implements ContentPlatfo
     public ContentPlatformGzhAccount getById(Long id) {
         return gzhAccountMapper.selectByPrimaryKey(id);
     }
+
+    @Override
+    public List<ContentPlatformGzhAccount> getCooperateAccountListByGhIds(Long loginAccountId, List<String> ghIds) {
+        ContentPlatformGzhAccountExample gzhAccountExample = new ContentPlatformGzhAccountExample();
+        gzhAccountExample.createCriteria().andCreateAccountIdEqualTo(loginAccountId).andGhIdIn(ghIds).andStatusEqualTo(1);
+        return gzhAccountMapper.selectByExample(gzhAccountExample);
+    }
+
+
+    @Override
+    public void gzhImport(List<String> channels) {
+        List<ContentPlatformAccount> accountList = accountService.getAccountListByChannels(channels);
+        if (CollectionUtils.isEmpty(accountList)) {
+            throw new CommonException(ExceptionEnum.ACCOUNT_NOT_EXISTS_WRONG);
+        }
+        for (ContentPlatformAccount account : accountList) {
+            List<GhDetail> ghDetailList = ghDetailService.getByChannel(account.getChannel());
+            Map<String, GhDetail> ghDetailMap = ghDetailList.stream().collect(Collectors.toMap(GhDetail::getGhId, Function.identity()));
+            List<String> ghIds = ghDetailList.stream().map(GhDetail::getGhId).collect(Collectors.toList());
+            List<ContentPlatformGzhAccount> gzhAccountList = getCooperateAccountListByGhIds(account.getId(), ghIds);
+            List<String> existGhIdList = new ArrayList<>();
+            for (ContentPlatformGzhAccount gzhAccount : gzhAccountList) {
+                existGhIdList.add(gzhAccount.getGhId());
+            }
+            Long now = System.currentTimeMillis();
+            List<String> addFailGhIds = new ArrayList<>();
+            for (String ghId : ghIds) {
+                if (existGhIdList.contains(ghId)) {
+                    continue;
+                }
+                List<ContentPlatformAccount> ghIdExistList = gzhAccountMapperExt.getGhIdExists(account.getId(), ghId);
+                if (CollectionUtils.isNotEmpty(ghIdExistList)) {
+                    addFailGhIds.add(ghId);
+                }
+                GhDetail ghDetail = ghDetailMap.get(ghId);
+                ContentPlatformGzhAccount gzhAccount = new ContentPlatformGzhAccount();
+                gzhAccount.setName(ghDetail.getGhName());
+                gzhAccount.setGhId(ghDetail.getGhId());
+                gzhAccount.setContentType(ghDetail.getCategory1());
+                gzhAccount.setUpdateTimestamp(now);
+                String externalId = aigcApiService.getDetailByGhId(ghDetail.getGhId());
+                if (StringUtils.hasText(externalId)) {
+                    gzhAccount.setExternalId(externalId);
+                }
+                gzhAccount.setCreateAccountId(account.getId());
+                gzhAccount.setCreateTimestamp(now);
+                gzhAccountMapper.insertSelective(gzhAccount);
+            }
+            if (CollectionUtils.isNotEmpty(addFailGhIds)) {
+                log.error("导入失败账号 channel:{} ghIds:{}", account.getChannel(), addFailGhIds);
+            }
+        }
+    }
 }

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

@@ -1,15 +1,18 @@
 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.PublishStageEnum;
 import com.tzld.piaoquan.api.common.enums.contentplatform.QwPlanTypeEnum;
 import com.tzld.piaoquan.api.common.exception.CommonException;
+import com.tzld.piaoquan.api.component.AdApiService;
 import com.tzld.piaoquan.api.component.AigcApiService;
 import com.tzld.piaoquan.api.component.ManagerApiService;
 import com.tzld.piaoquan.api.component.VlogApiService;
 import com.tzld.piaoquan.api.dao.mapper.contentplatform.*;
 import com.tzld.piaoquan.api.dao.mapper.contentplatform.ext.ContentPlatformPlanMapperExt;
+import com.tzld.piaoquan.api.model.bo.AdPutFlowRecordTencent;
 import com.tzld.piaoquan.api.model.config.LoginUserContext;
 import com.tzld.piaoquan.api.model.param.contentplatform.*;
 import com.tzld.piaoquan.api.model.po.contentplatform.*;
@@ -19,6 +22,7 @@ import com.tzld.piaoquan.api.model.vo.contentplatform.GzhPlanVideoContentItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.QwPlanItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.VideoContentItemVO;
 import com.tzld.piaoquan.api.service.GhDetailService;
+import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformAccountService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformCooperateAccountService;
 import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
 import com.tzld.piaoquan.growth.common.common.enums.GhTypeEnum;
@@ -76,10 +80,17 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
     private MessageAttachmentService messageAttachmentService;
     @Autowired
     private VlogApiService vlogApiService;
+    @Autowired
+    private ContentPlatformAccountService accountService;
+    @Autowired
+    private AdApiService adApiService;
 
     @Value("${vlog.share.appType:11}")
     private String shareAppType;
 
+    @Value("${video.min.score:0.6}")
+    private Double videoMinScore;
+
     @Override
     public Page<GzhPlanItemVO> gzhPlanList(GzhPlanListParam param) {
         ContentPlatformAccount loginAccount = LoginUserContext.getUser();
@@ -187,6 +198,12 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
             throw new CommonException(ExceptionEnum.GZH_PLAN_VIDEO_SIZE_EXCEED);
         }
         ContentPlatformGzhAccount account = cooperateAccountService.getById(param.getAccountId());
+        if (Objects.isNull(account)) {
+            throw new CommonException(ExceptionEnum.GZH_ACCOUNT_NOT_EXISTS);
+        }
+        if (!StringUtils.hasText(account.getExternalId()) && param.getPublishStage().equals(PublishStageEnum.PLATFORM.getVal())) {
+            throw new CommonException(ExceptionEnum.GZH_ACCOUNT_NOT_AUTH);
+        }
         Long now = System.currentTimeMillis();
         ContentPlatformGzhPlan gzhPlan = new ContentPlatformGzhPlan();
         gzhPlan.setAccountId(param.getAccountId());
@@ -201,7 +218,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         if (Objects.isNull(param.getId())) {
             // 调用aigc创建发布计划
             if (PublishStageEnum.PLATFORM.getVal() == param.getPublishStage()) {
-                String externalId = aigcApiService.createPublishPlan(account.getExternalId(), account.getName());
+                String externalId = aigcApiService.createPublishPlan(account.getExternalId(), account.getName(), loginAccount.getChannel());
                 gzhPlan.setExternalId(externalId);
             }
             gzhPlan.setCreateAccountId(loginAccount.getId());
@@ -217,7 +234,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
                 if (StringUtils.hasText(oldPlan.getExternalId())) {
                     aigcApiService.changePublishPlanStatus(oldPlan.getExternalId(), 1);
                 } else {
-                    String externalId = aigcApiService.createPublishPlan(account.getExternalId(), account.getName());
+                    String externalId = aigcApiService.createPublishPlan(account.getExternalId(), account.getName(), loginAccount.getChannel());
                     gzhPlan.setExternalId(externalId);
                 }
             }
@@ -322,6 +339,13 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         return gzhPlanMapper.selectByExample(example);
     }
 
+    @Override
+    public List<ContentPlatformGzhPlan> getGzhPlanListByCreateAccountId(Long createAccountId) {
+        ContentPlatformGzhPlanExample example = new ContentPlatformGzhPlanExample();
+        example.createCriteria().andCreateAccountIdEqualTo(createAccountId).andStatusEqualTo(1);
+        return gzhPlanMapper.selectByExample(example);
+    }
+
     @Override
     public List<ContentPlatformGzhPlan> getGzhPlanListByCooperateAccountIds(List<Long> accountIds) {
         ContentPlatformGzhPlanExample example = new ContentPlatformGzhPlanExample();
@@ -334,12 +358,12 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         Page<VideoContentItemVO> result = new Page<>(param.getPageNum(), param.getPageSize());
         int offset = (param.getPageNum() - 1) * param.getPageSize();
         String dt = planMapperExt.getVideoMaxDt();
-        int count = planMapperExt.getVideoCount(param, dt);
+        int count = planMapperExt.getVideoCount(param, dt, videoMinScore);
         result.setTotalSize(count);
         if (count == 0) {
             return result;
         }
-        List<ContentPlatformVideo> videoList = planMapperExt.getVideoList(param, dt, offset, param.getPageSize());
+        List<ContentPlatformVideo> videoList = planMapperExt.getVideoList(param, dt, videoMinScore, offset, param.getPageSize());
         List<VideoContentItemVO> list = buildVideoContentItemVOList(videoList);
         result.setObjs(list);
         return result;
@@ -349,7 +373,9 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         if (CollectionUtils.isEmpty(videoList)) {
             return null;
         }
-        List<Long> videoIds = videoList.stream().map(ContentPlatformVideo::getVideoId).distinct().collect(Collectors.toList());
+        List<Long> videoIds = videoList.stream()
+                .filter(o -> !StringUtils.hasText(o.getCover()))
+                .map(ContentPlatformVideo::getVideoId).distinct().collect(Collectors.toList());
         Map<Long, VideoDetail> coverMap = new HashMap<>();
         for (List<Long> partition : Lists.partition(videoIds, 20)) {
             Set<Long> ids = new HashSet<>(partition);
@@ -360,6 +386,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
             VideoContentItemVO item = new VideoContentItemVO();
             item.setVideoId(video.getVideoId());
             item.setTitle(video.getTitle());
+            item.setCover(video.getCover());
             VideoDetail detail = coverMap.get(video.getVideoId());
             if (Objects.nonNull(detail)) {
                 String cover = detail.getCover().substring(0, detail.getCover().indexOf("/watermark"));
@@ -502,4 +529,121 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
         return qwPlanVideoMapper.selectByExample(example);
     }
 
+    @Override
+    public void gzhPlanImport(List<String> channels) {
+        List<ContentPlatformAccount> accountList = accountService.getAccountListByChannels(channels);
+        for (ContentPlatformAccount account : accountList) {
+            Long now = System.currentTimeMillis();
+            List<GhDetail> ghDetailList = ghDetailService.getByChannel(account.getChannel());
+            ghDetailList = ghDetailList.stream()
+                    .filter(o -> Objects.equals(o.getStrategyStatus(), StrategyStatusEnum.DEFAULT.status))
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isEmpty(ghDetailList)) {
+                continue;
+            }
+            List<String> ghIds = ghDetailList.stream().map(GhDetail::getGhId).collect(Collectors.toList());
+            List<ContentPlatformGzhAccount> gzhAccountList = cooperateAccountService.getCooperateAccountListByGhIds(account.getId(), ghIds);
+            List<ContentPlatformGzhPlan> existsPlanList = getGzhPlanListByCreateAccountId(account.getId());
+            List<Long> existsAccountIds = existsPlanList.stream().map(ContentPlatformGzhPlan::getAccountId).collect(Collectors.toList());
+            Map<String, ContentPlatformGzhAccount> gzhAccountMap = gzhAccountList.stream()
+                    .collect(Collectors.toMap(ContentPlatformGzhAccount::getGhId, Function.identity()));
+            for (GhDetail ghDetail : ghDetailList) {
+                ContentPlatformGzhAccount gzhAccount = gzhAccountMap.get(ghDetail.getGhId());
+                ContentPlatformGzhPlan gzhPlan = new ContentPlatformGzhPlan();
+                if (existsAccountIds.contains(gzhAccount.getId())) {
+                    continue;
+                }
+                gzhPlan.setAccountId(gzhAccount.getId());
+                gzhPlan.setScene(0);
+                gzhPlan.setPublishStage(PublishStageEnum.USER.getVal());
+                if (StringUtils.hasText(gzhAccount.getExternalId())) {
+                    aigcApiService.closeAccountMessagePublishPlan(gzhAccount.getExternalId());
+                    gzhPlan.setPublishStage(PublishStageEnum.PLATFORM.getVal());
+                    String externalId = aigcApiService.createPublishPlan(gzhAccount.getExternalId(), gzhAccount.getName(), account.getChannel());
+                    gzhPlan.setExternalId(externalId);
+                }
+                gzhPlan.setCreateAccountId(account.getId());
+                gzhPlan.setCreateTimestamp(now);
+                gzhPlan.setUpdateTimestamp(now);
+                planMapperExt.insertGzhPlanReturnId(gzhPlan);
+                List<Long> videoIds = JSONObject.parseArray(ghDetail.getVideoIds(), Long.class);
+                Map<Long, VideoDetail> videoMap = messageAttachmentService.getVideoDetail(new HashSet<>(videoIds));
+                for (Map.Entry<Long, VideoDetail> entry : videoMap.entrySet()) {
+                    Long videoId = entry.getKey();
+                    VideoDetail videoDetail = entry.getValue();
+                    ContentPlatformGzhPlanVideo item = new ContentPlatformGzhPlanVideo();
+                    item.setPlanId(gzhPlan.getId());
+                    item.setVideoId(videoId);
+                    item.setTitle(videoDetail.getTitle());
+                    item.setCover(videoDetail.getCover());
+                    item.setVideo(videoDetail.getVideoPath());
+                    item.setCreateAccountId(account.getId());
+                    item.setCreateTimestamp(System.currentTimeMillis());
+                    gzhPlanVideoMapper.insertSelective(item);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void qwPlanImport(List<String> channels) {
+        List<AdPutFlowRecordTencent> list = new ArrayList<>();
+        for (String channel : channels) {
+            Integer count = adApiService.getPutFlowListTencentCount(channel, 1, 1);
+            if (count == 0) {
+                continue;
+            }
+            int pageNum = 1000;
+            int totalPage = (count / pageNum) + 1;
+            for (int i = 1; i <= totalPage; i++) {
+                list.addAll(adApiService.getPutFlowListTencent(channel, i, pageNum));
+            }
+        }
+        List<String> filterChannels = Arrays.asList("ml2025", "mj", "nh", "qc", "tczy", "wb", "xj", "wxm", "wxmx1", "wxmx", "xycsd", "xycsd1", "xycsd2", "xycsd3", "xycsd4", "xycsd5", "xycsd6", "xycsd7", "xycsd8", "xycsd9", "xycsd10", "xycsd11", "xycsd12", "xycsd13", "xycsd14", "xycsd15", "xycsd16", "xycsd17", "xycsd18", "shy");
+        Map<String, List<AdPutFlowRecordTencent>> channelMap = list.stream()
+                .filter(o -> filterChannels.contains(o.getChannel()))
+                .collect(Collectors.groupingBy(AdPutFlowRecordTencent::getChannel));
+        for (Map.Entry<String, List<AdPutFlowRecordTencent>> entry : channelMap.entrySet()) {
+            String channel = entry.getKey();
+            List<AdPutFlowRecordTencent> recordList = entry.getValue();
+            ContentPlatformAccount account = accountService.getAccountByChannel(channel);
+            List<String> rootSourceIds = recordList.stream().map(AdPutFlowRecordTencent::getRootSourceId).distinct().collect(Collectors.toList());
+            List<ContentPlatformQwPlan> existsPlanList = getQwPlanListByRootSourceIds(rootSourceIds);
+            List<String> existsRootSourceIds = existsPlanList.stream().map(ContentPlatformQwPlan::getRootSourceId).collect(Collectors.toList());
+            List<Long> videoIds = recordList.stream().filter(o -> !existsRootSourceIds.contains(o.getRootSourceId()))
+                    .map(AdPutFlowRecordTencent::getVideoId).distinct().collect(Collectors.toList());
+            Map<Long, VideoDetail> videoMap = new HashMap<>();
+            for (List<Long> partition : Lists.partition(videoIds, 20)) {
+                Set<Long> ids = new HashSet<>(partition);
+                videoMap.putAll(messageAttachmentService.getVideoDetail(ids));
+            }
+            Long now = System.currentTimeMillis();
+            for (AdPutFlowRecordTencent record : recordList) {
+                if (existsRootSourceIds.contains(record.getRootSourceId())) {
+                    continue;
+                }
+                ContentPlatformQwPlan qwPlan = new ContentPlatformQwPlan();
+                QwPlanTypeEnum typeEnum = QwPlanTypeEnum.from(record.getPutTypeTwo());
+                qwPlan.setType(typeEnum.getVal());
+                qwPlan.setScene(0);
+                qwPlan.setPageUrl(record.getUrl());
+                qwPlan.setRootSourceId(record.getRootSourceId());
+                qwPlan.setCreateAccountId(account.getId());
+                qwPlan.setCreateTimestamp(now);
+                // 保存视频内容
+                VideoDetail videoDetail = videoMap.get(record.getVideoId());
+                if (Objects.isNull(videoDetail)) {
+                    continue;
+                }
+                QwPlanSaveVideoParam videoParam = new QwPlanSaveVideoParam();
+                videoParam.setVideoId(record.getVideoId());
+                videoParam.setTitle(record.getVideoTitle());
+                videoParam.setCover(videoDetail.getCover());
+                videoParam.setVideo(videoDetail.getVideoPath());
+                planMapperExt.insertQwPlanReturnId(qwPlan);
+                saveQwPlanVideo(videoParam, qwPlan.getId(), account.getId());
+            }
+        }
+    }
+
 }

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

@@ -233,5 +233,12 @@ public class GhDetailServiceImpl implements GhDetailService {
         return null;
     }
 
+    @Override
+    public List<GhDetail> getByChannel(String channel) {
+        GhDetailExample ghDetailExample = new GhDetailExample();
+        ghDetailExample.createCriteria().andChannelEqualTo(channel).andIsDeleteEqualTo(0);
+        return ghDetailMapper.selectByExample(ghDetailExample);
+    }
+
 
 }

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

@@ -320,6 +320,9 @@ public class BuckStrategyV1 implements ReplyStrategyService {
             }
         } else if (Objects.equals(StrategyStatusEnum.STRATEGY.status, bucketDataParam.getStrategyStatus())) {
             for (String key : keyedSet) {
+                if ("base".equals(key)) {
+                    continue;
+                }
                 List<CgiReplyBucketData> strategyData = getStrategyData(key);
                 if (!CollectionUtils.isEmpty(strategyData)) {
                     result.addAll(strategyData);

api-module/src/main/resources/mapper/contentplatform/ContentPlatformVideoAggMapper.xml

@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.tzld.piaoquan.api.dao.mapper.contentplatform.ContentPlatformVideoAggMapper">
+  <resultMap id="BaseResultMap" type="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="dt" jdbcType="VARCHAR" property="dt" />
+    <result column="video_id" jdbcType="BIGINT" property="videoId" />
+    <result column="category" jdbcType="VARCHAR" property="category" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="cover" jdbcType="VARCHAR" property="cover" />
+    <result column="video" jdbcType="VARCHAR" property="video" />
+    <result column="score" jdbcType="DOUBLE" property="score" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="create_timestamp" jdbcType="BIGINT" property="createTimestamp" />
+    <result column="update_timestamp" jdbcType="BIGINT" property="updateTimestamp" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, dt, video_id, category, title, cover, video, score, `status`, create_timestamp, 
+    update_timestamp
+  </sql>
+  <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAggExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from content_platform_video_agg
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="page != null">
+      limit #{page.offset} , #{page.pageSize}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from content_platform_video_agg
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from content_platform_video_agg
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAggExample">
+    delete from content_platform_video_agg
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg">
+    insert into content_platform_video_agg (id, dt, video_id, 
+      category, title, cover, 
+      video, score, `status`, 
+      create_timestamp, update_timestamp)
+    values (#{id,jdbcType=BIGINT}, #{dt,jdbcType=VARCHAR}, #{videoId,jdbcType=BIGINT}, 
+      #{category,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{cover,jdbcType=VARCHAR}, 
+      #{video,jdbcType=VARCHAR}, #{score,jdbcType=DOUBLE}, #{status,jdbcType=INTEGER}, 
+      #{createTimestamp,jdbcType=BIGINT}, #{updateTimestamp,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg">
+    insert into content_platform_video_agg
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="dt != null">
+        dt,
+      </if>
+      <if test="videoId != null">
+        video_id,
+      </if>
+      <if test="category != null">
+        category,
+      </if>
+      <if test="title != null">
+        title,
+      </if>
+      <if test="cover != null">
+        cover,
+      </if>
+      <if test="video != null">
+        video,
+      </if>
+      <if test="score != null">
+        score,
+      </if>
+      <if test="status != null">
+        `status`,
+      </if>
+      <if test="createTimestamp != null">
+        create_timestamp,
+      </if>
+      <if test="updateTimestamp != null">
+        update_timestamp,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="dt != null">
+        #{dt,jdbcType=VARCHAR},
+      </if>
+      <if test="videoId != null">
+        #{videoId,jdbcType=BIGINT},
+      </if>
+      <if test="category != null">
+        #{category,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="cover != null">
+        #{cover,jdbcType=VARCHAR},
+      </if>
+      <if test="video != null">
+        #{video,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        #{score,jdbcType=DOUBLE},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTimestamp != null">
+        #{createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="updateTimestamp != null">
+        #{updateTimestamp,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAggExample" resultType="java.lang.Long">
+    select count(*) from content_platform_video_agg
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update content_platform_video_agg
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.dt != null">
+        dt = #{record.dt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.videoId != null">
+        video_id = #{record.videoId,jdbcType=BIGINT},
+      </if>
+      <if test="record.category != null">
+        category = #{record.category,jdbcType=VARCHAR},
+      </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cover != null">
+        cover = #{record.cover,jdbcType=VARCHAR},
+      </if>
+      <if test="record.video != null">
+        video = #{record.video,jdbcType=VARCHAR},
+      </if>
+      <if test="record.score != null">
+        score = #{record.score,jdbcType=DOUBLE},
+      </if>
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTimestamp != null">
+        create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="record.updateTimestamp != null">
+        update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update content_platform_video_agg
+    set id = #{record.id,jdbcType=BIGINT},
+      dt = #{record.dt,jdbcType=VARCHAR},
+      video_id = #{record.videoId,jdbcType=BIGINT},
+      category = #{record.category,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
+      cover = #{record.cover,jdbcType=VARCHAR},
+      video = #{record.video,jdbcType=VARCHAR},
+      score = #{record.score,jdbcType=DOUBLE},
+      `status` = #{record.status,jdbcType=INTEGER},
+      create_timestamp = #{record.createTimestamp,jdbcType=BIGINT},
+      update_timestamp = #{record.updateTimestamp,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg">
+    update content_platform_video_agg
+    <set>
+      <if test="dt != null">
+        dt = #{dt,jdbcType=VARCHAR},
+      </if>
+      <if test="videoId != null">
+        video_id = #{videoId,jdbcType=BIGINT},
+      </if>
+      <if test="category != null">
+        category = #{category,jdbcType=VARCHAR},
+      </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
+      <if test="cover != null">
+        cover = #{cover,jdbcType=VARCHAR},
+      </if>
+      <if test="video != null">
+        video = #{video,jdbcType=VARCHAR},
+      </if>
+      <if test="score != null">
+        score = #{score,jdbcType=DOUBLE},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="createTimestamp != null">
+        create_timestamp = #{createTimestamp,jdbcType=BIGINT},
+      </if>
+      <if test="updateTimestamp != null">
+        update_timestamp = #{updateTimestamp,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg">
+    update content_platform_video_agg
+    set dt = #{dt,jdbcType=VARCHAR},
+      video_id = #{videoId,jdbcType=BIGINT},
+      category = #{category,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
+      cover = #{cover,jdbcType=VARCHAR},
+      video = #{video,jdbcType=VARCHAR},
+      score = #{score,jdbcType=DOUBLE},
+      `status` = #{status,jdbcType=INTEGER},
+      create_timestamp = #{createTimestamp,jdbcType=BIGINT},
+      update_timestamp = #{updateTimestamp,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

api-module/src/main/resources/mapper/contentplatform/ContentPlatformVideoMapper.xml

@@ -7,6 +7,7 @@
     <result column="video_id" jdbcType="BIGINT" property="videoId" />
     <result column="category" jdbcType="VARCHAR" property="category" />
     <result column="title" jdbcType="VARCHAR" property="title" />
+    <result column="cover" jdbcType="VARCHAR" property="cover" />
     <result column="video" jdbcType="VARCHAR" property="video" />
     <result column="score" jdbcType="DOUBLE" property="score" />
     <result column="status" jdbcType="INTEGER" property="status" />
@@ -72,7 +73,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, dt, video_id, category, title, video, score, `status`, create_timestamp, update_timestamp
+    id, dt, video_id, category, title, cover, video, score, `status`, create_timestamp, 
+    update_timestamp
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoExample" resultMap="BaseResultMap">
     select
@@ -109,13 +111,13 @@
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideo">
     insert into content_platform_video (id, dt, video_id, 
-      category, title, video, 
-      score, `status`, create_timestamp, 
-      update_timestamp)
+      category, title, cover, 
+      video, score, `status`, 
+      create_timestamp, update_timestamp)
     values (#{id,jdbcType=BIGINT}, #{dt,jdbcType=VARCHAR}, #{videoId,jdbcType=BIGINT}, 
-      #{category,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{video,jdbcType=VARCHAR}, 
-      #{score,jdbcType=DOUBLE}, #{status,jdbcType=INTEGER}, #{createTimestamp,jdbcType=BIGINT}, 
-      #{updateTimestamp,jdbcType=BIGINT})
+      #{category,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{cover,jdbcType=VARCHAR}, 
+      #{video,jdbcType=VARCHAR}, #{score,jdbcType=DOUBLE}, #{status,jdbcType=INTEGER}, 
+      #{createTimestamp,jdbcType=BIGINT}, #{updateTimestamp,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideo">
     insert into content_platform_video
@@ -135,6 +137,9 @@
       <if test="title != null">
         title,
       </if>
+      <if test="cover != null">
+        cover,
+      </if>
       <if test="video != null">
         video,
       </if>
@@ -167,6 +172,9 @@
       <if test="title != null">
         #{title,jdbcType=VARCHAR},
       </if>
+      <if test="cover != null">
+        #{cover,jdbcType=VARCHAR},
+      </if>
       <if test="video != null">
         #{video,jdbcType=VARCHAR},
       </if>
@@ -208,6 +216,9 @@
       <if test="record.title != null">
         title = #{record.title,jdbcType=VARCHAR},
       </if>
+      <if test="record.cover != null">
+        cover = #{record.cover,jdbcType=VARCHAR},
+      </if>
       <if test="record.video != null">
         video = #{record.video,jdbcType=VARCHAR},
       </if>
@@ -235,6 +246,7 @@
       video_id = #{record.videoId,jdbcType=BIGINT},
       category = #{record.category,jdbcType=VARCHAR},
       title = #{record.title,jdbcType=VARCHAR},
+      cover = #{record.cover,jdbcType=VARCHAR},
       video = #{record.video,jdbcType=VARCHAR},
       score = #{record.score,jdbcType=DOUBLE},
       `status` = #{record.status,jdbcType=INTEGER},
@@ -259,6 +271,9 @@
       <if test="title != null">
         title = #{title,jdbcType=VARCHAR},
       </if>
+      <if test="cover != null">
+        cover = #{cover,jdbcType=VARCHAR},
+      </if>
       <if test="video != null">
         video = #{video,jdbcType=VARCHAR},
       </if>
@@ -283,6 +298,7 @@
       video_id = #{videoId,jdbcType=BIGINT},
       category = #{category,jdbcType=VARCHAR},
       title = #{title,jdbcType=VARCHAR},
+      cover = #{cover,jdbcType=VARCHAR},
       video = #{video,jdbcType=VARCHAR},
       score = #{score,jdbcType=DOUBLE},
       `status` = #{status,jdbcType=INTEGER},

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

@@ -75,13 +75,13 @@
 
     <select id="getVideoMaxDt" resultType="java.lang.String">
         select max(dt)
-        from content_platform_video
+        from content_platform_video_agg
     </select>
 
     <select id="getVideoCount" resultType="java.lang.Integer">
         select count(1)
-        from content_platform_video
-        where dt = #{dt} and status = 1
+        from content_platform_video_agg
+        where dt = #{dt} and status = 1 and score > #{minScore}
         <if test="param.title!= null and param.title!= ''">
             and title like concat('%', #{param.title}, '%')
         </if>
@@ -92,8 +92,8 @@
 
     <select id="getVideoList" resultType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideo">
         select *
-        from content_platform_video
-        where dt = #{dt} and status = 1
+        from content_platform_video_agg
+        where dt = #{dt} and status = 1 and score > #{minScore}
         <if test="param.title!= null and param.title!= ''">
             and title like concat('%', #{param.title}, '%')
         </if>
@@ -106,15 +106,24 @@
 
     <select id="getVideoCategoryList" resultType="java.lang.String">
         select distinct category
-        from content_platform_video
+        from content_platform_video_agg
         where dt = #{dt} and status = 1
     </select>
 
     <insert id="batchInsertContentPlatformVideo">
-        insert into content_platform_video (dt, video_id, category, title, video, score, create_timestamp)
+        insert into content_platform_video (dt, video_id, category, title, cover, video, score, create_timestamp)
         values
         <foreach collection="records" item="item" separator=",">
-            (#{item.dt}, #{item.videoId}, #{item.category}, #{item.title}, #{item.video}, #{item.score},
+            (#{item.dt}, #{item.videoId}, #{item.category}, #{item.title}, #{item.cover}, #{item.video}, #{item.score},
+            #{item.createTimestamp})
+        </foreach>
+    </insert>
+
+    <insert id="batchInsertContentPlatformVideoAgg">
+        insert into content_platform_video_agg (dt, video_id, category, title, cover, video, score, create_timestamp)
+        values
+        <foreach collection="records" item="item" separator=",">
+            (#{item.dt}, #{item.videoId}, #{item.category}, #{item.title}, #{item.cover}, #{item.video}, #{item.score},
             #{item.createTimestamp})
         </foreach>
     </insert>
@@ -183,6 +192,22 @@
           and cpgp.status = 1
     </select>
 
+    <select id="getVideoAggList"
+            resultType="com.tzld.piaoquan.api.model.po.contentplatform.ContentPlatformVideoAgg">
+        SELECT t.video_id, t.category, t.title, t.cover, t.video, round(t.avg_score, 3) as score
+        FROM (
+        SELECT video_id, category, title, cover, video, AVG(score) OVER (PARTITION BY video_id) AS avg_score,
+            ROW_NUMBER() OVER (PARTITION BY video_id ORDER BY dt DESC) AS rn
+        FROM content_platform_video
+        where dt in
+        <foreach collection="dtList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and status = 1
+        ) AS t
+        WHERE t.rn = 1;
+    </select>
+
     <update id="updateVideoStatus">
         update content_platform_video
         set status = 0,
@@ -190,4 +215,11 @@
         where video_id = #{videoId}
     </update>
 
+    <update id="updateVideoAggStatus">
+        update content_platform_video_agg
+        set status = 0,
+            update_timestamp = #{now}
+        where video_id = #{videoId}
+    </update>
+
 </mapper>

api-module/src/main/resources/mybatis-api-contentPlatform-generator-config.xml

@@ -60,6 +60,7 @@
         <table tableName="content_platform_qw_plan_video" domainObjectName="ContentPlatformQwPlanVideo" alias=""/>
         <table tableName="content_platform_verify_code" domainObjectName="ContentPlatformVerifyCode" alias=""/>
         <table tableName="content_platform_video" domainObjectName="ContentPlatformVideo" alias=""/>
+        <table tableName="content_platform_video_agg" domainObjectName="ContentPlatformVideoAgg" alias=""/>
 
     </context>
 

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

@@ -0,0 +1,42 @@
+package com.tzld.piaoquan.api;
+
+import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformCooperateAccountService;
+import com.tzld.piaoquan.api.service.contentplatform.ContentPlatformPlanService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SpringBootTest(classes = GrowthServerApplication.class)
+@Slf4j
+public class ContentPlatformTest {
+
+    @Autowired
+    ContentPlatformCooperateAccountService cooperateAccountService;
+
+    @Autowired
+    ContentPlatformPlanService planService;
+
+    @Test
+    public void testImportGzhAccount() {
+        List<String> channels = Arrays.asList("ml","yy","zh","llf","wxm","hc","xs","wx","yqst","lq","bh","qd","bz","sw","pj","cy","xsy","ls","zqh");
+        cooperateAccountService.gzhImport(channels);
+    }
+
+    @Test
+    public void testImportGzhPlan() {
+        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.gzhPlanImport(channels);
+    }
+
+    @Test
+    public void testImportQwPlan() {
+        List<String> channels = Arrays.asList("ml2025", "mj", "nh", "qc", "tczy", "wb", "xj", "wxm", "xycsd", "shy");
+        planService.qwPlanImport(channels);
+    }
+
+
+}

common-module/src/main/java/com/tzld/piaoquan/growth/common/common/constant/WeComServerConstant.java

@@ -7,4 +7,10 @@ public interface WeComServerConstant {
     String ENCODING_AES_KEY = "i2DhQ6AjBGpacrSA8NNXIW1MWRzCAwowbrEd30GWEeR";
 
     String CORP_ID = "wwa4015dc7d652a21f";
+
+    String YLQ_TOKEN = "F1JmYZAPsiLyO3Jifz9qLCFD";
+
+    String YLQ_ENCODING_AES_KEY = "UMw7T7TBHKnyXapbY1VdYdBYKzqrdZPs0tIHnquf1ey";
+
+    String YLQ_CORP_ID = "ww541056f62f568c58";
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/common/enums/CorpEnum.java

@@ -5,7 +5,8 @@ import lombok.Getter;
 @Getter
 public enum CorpEnum {
 
-    HNWQ(1L, "湖南为趣时代");
+    HNWQ(1L, "湖南为趣时代"),
+    YLQ(2L, "优量圈");
 
     final Long id;
     final String desc;

common-module/src/main/java/com/tzld/piaoquan/growth/common/config/HttpClientConfig.java

@@ -15,21 +15,21 @@ public class HttpClientConfig {
     /**
      * 链接建立的超时时间 ms
      */
-    private static final int CONNECTION_TIMEOUT = 3000;
+    private static final int CONNECTION_TIMEOUT = 5000;
     /**
      * 响应超时时间 ms
      */
-    private static final int SOCKET_TIMEOUT = 10000;
+    private static final int SOCKET_TIMEOUT = 30000;
 
     /**
      * 每个路由的最大连接数
      */
-    private static final int MAX_PER_ROUTE = 20;
+    private static final int MAX_PER_ROUTE = 100;
 
     /**
      * 最大连接数
      */
-    private static final int MAX_TOTAL = 100;
+    private static final int MAX_TOTAL = 500;
 
     /**
      * 重试次数，默认0
@@ -39,7 +39,7 @@ public class HttpClientConfig {
     /**
      * 从connection pool中获得一个connection的超时时间 ms
      */
-    private static final int CONNECTION_WAIT_TIMEOUT = 2000;
+    private static final int CONNECTION_WAIT_TIMEOUT = 5000;
 
 
     @Bean

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/bo/VideoDetail.java

@@ -8,4 +8,12 @@ public class VideoDetail {
     private String cover;
 
     private String title;
+
+    private String videoPath;
+
+    // 审核状态  1 审核中，2 不通过 3 待修改，4 自己可见 5 通过
+    private Integer auditStatus;
+
+    // 推荐状态（0：不可搜，-6：待推荐，1：普通推荐，10：编辑推荐,-7:可搜索）
+    private Integer recommendStatus;
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/MessageAttachmentServiceImpl.java

@@ -296,11 +296,18 @@ public class MessageAttachmentServiceImpl implements MessageAttachmentService {
             for (int i = 0; i < data.size(); i++) {
                 VideoDetail videoDetail = new VideoDetail();
                 JSONObject jsonObject = data.getJSONObject(i);
+                if (Objects.isNull(jsonObject)) {
+                    continue;
+                }
                 Long videoId = jsonObject.getLong("id");
                 String shareImgPath = jsonObject.getString("shareImgPath");
                 String title = jsonObject.getString("title");
+                String videoPath = jsonObject.getString("videoPath");
                 videoDetail.setCover(shareImgPath);
                 videoDetail.setTitle(title);
+                videoDetail.setVideoPath(videoPath);
+                videoDetail.setAuditStatus(jsonObject.getInteger("auditStatus"));
+                videoDetail.setRecommendStatus(jsonObject.getInteger("recommendStatus"));
                 map.put(videoId, videoDetail);
             }
             return map;

common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/DateUtil.java

@@ -1,6 +1,8 @@
 package com.tzld.piaoquan.growth.common.utils;
 
 
+import org.springframework.util.StringUtils;
+
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -8,9 +10,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
+import java.util.*;
 
 public class DateUtil {
 
@@ -164,4 +164,35 @@ public class DateUtil {
         return Date.from(localDate.atStartOfDay(zone).toInstant());
     }
 
+    public static List<String> getBeforeDays(int days) {
+        return getBeforeDays(null, null, days);
+    }
+
+    public static List<String> getBeforeDays(String beginDate, String endDate, int days) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+        // 获取今天的日期
+        LocalDate today = LocalDate.now();
+        if (!StringUtils.hasText(beginDate)) {
+            beginDate = today.format(formatter);
+        }
+        if (!StringUtils.hasText(endDate)) {
+            endDate = today.format(formatter);
+        }
+        // 解析输入的日期字符串为LocalDate对象
+        LocalDate date = LocalDate.parse(beginDate, formatter);
+        LocalDate end = LocalDate.parse(endDate, formatter);
+        // 获取从输入日期前三天的日期
+        LocalDate startDate = date.minusDays(days);
+        // 存储所有日期的列表
+        List<String> datesList = new ArrayList<>();
+        // 从startDate到today遍历日期
+        while (startDate.isBefore(today) && !startDate.isAfter(end)) {
+            // 将当前日期格式化为"yyyyMMdd"并添加到列表中
+            datesList.add(startDate.format(formatter));
+            // 日期加1天
+            startDate = startDate.plusDays(1);
+        }
+        return datesList;
+    }
+
 }

common-module/src/main/java/com/tzld/piaoquan/growth/common/utils/LarkRobotUtil.java

@@ -28,7 +28,7 @@ public class LarkRobotUtil {
 
 
     public static void sendMessage(String msg) {
-        sendMessage("text", "企微推送报警：" + msg);
+        sendMessage("text", msg);
     }
 
     public static void sendMessage(String type, String msg) {