Merge branch 'dev-xym-long-article' of Server/long-article-manage into master

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/bo/MatchContent.java

@@ -26,4 +26,6 @@ public class MatchContent {
     private String channelContentId;
 
     private Integer publishFlag;
+
+    private String videoPoolTraceId;
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/dto/MiniprogramCardRequest.java

@@ -18,4 +18,5 @@ public class MiniprogramCardRequest {
     private String flowPoolLevelTag;
     private Integer publishFlag;
     private String channelContentId;
+    private String videoPoolTraceId;
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/MatchVideo.java

@@ -15,6 +15,8 @@ public class MatchVideo {
 
     private String accountName;
 
+    private String contentTraceId;
+
     private Integer contentStatus;
 
     private Integer contentStatusUpdateTime;
@@ -79,6 +81,14 @@ public class MatchVideo {
         this.accountName = accountName;
     }
 
+    public String getContentTraceId() {
+        return contentTraceId;
+    }
+
+    public void setContentTraceId(String contentTraceId) {
+        this.contentTraceId = contentTraceId;
+    }
+
     public Integer getContentStatus() {
         return contentStatus;
     }
@@ -155,6 +165,7 @@ public class MatchVideo {
         sb.append(", flowPoolLevel=").append(flowPoolLevel);
         sb.append(", ghId=").append(ghId);
         sb.append(", accountName=").append(accountName);
+        sb.append(", contentTraceId=").append(contentTraceId);
         sb.append(", contentStatus=").append(contentStatus);
         sb.append(", contentStatusUpdateTime=").append(contentStatusUpdateTime);
         sb.append(", successStatus=").append(successStatus);

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/po/longarticle/MatchVideoExample.java

@@ -526,6 +526,76 @@ public class MatchVideoExample {
             return (Criteria) this;
         }
 
+        public Criteria andContentTraceIdIsNull() {
+            addCriterion("content_trace_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdIsNotNull() {
+            addCriterion("content_trace_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdEqualTo(String value) {
+            addCriterion("content_trace_id =", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdNotEqualTo(String value) {
+            addCriterion("content_trace_id <>", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdGreaterThan(String value) {
+            addCriterion("content_trace_id >", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdGreaterThanOrEqualTo(String value) {
+            addCriterion("content_trace_id >=", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdLessThan(String value) {
+            addCriterion("content_trace_id <", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdLessThanOrEqualTo(String value) {
+            addCriterion("content_trace_id <=", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdLike(String value) {
+            addCriterion("content_trace_id like", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdNotLike(String value) {
+            addCriterion("content_trace_id not like", value, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdIn(List<String> values) {
+            addCriterion("content_trace_id in", values, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdNotIn(List<String> values) {
+            addCriterion("content_trace_id not in", values, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdBetween(String value1, String value2) {
+            addCriterion("content_trace_id between", value1, value2, "contentTraceId");
+            return (Criteria) this;
+        }
+
+        public Criteria andContentTraceIdNotBetween(String value1, String value2) {
+            addCriterion("content_trace_id not between", value1, value2, "contentTraceId");
+            return (Criteria) this;
+        }
+
         public Criteria andContentStatusIsNull() {
             addCriterion("content_status is null");
             return (Criteria) this;

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/model/vo/ContentItemVO.java

@@ -18,9 +18,13 @@ public class ContentItemVO {
     private String title;
     //"正文")
     private String content;
+
     private String flowPoolLevelTag;
 
     private Integer sourceType;
+
     private String channelContentId;
 
+    private String videoPoolTraceId;
+
 }

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -348,6 +348,7 @@ public class CoreServiceImpl implements CoreService {
                                 request.setArticleId(matchContent.getSourceId());
                                 request.setFlowPoolLevelTag(matchContent.getFlowPoolLevelTag());
                                 request.setPublishFlag(PublicFlagEnum.NOT_PUBLIC.getStatusCode());
+                                request.setVideoPoolTraceId(matchContent.getVideoPoolTraceId());
                                 Integer status = matchService.matchMiniprogramVideo(request);
                                 if (status == MatchRequestStatusEnum.NOT_CONTENT.getStatusCode()) {
                                     MatchMiniprogramStatusParam statusParam = new MatchMiniprogramStatusParam();
@@ -391,6 +392,7 @@ public class CoreServiceImpl implements CoreService {
                     matchContent.setFlowPoolLevelTag(contentItemVO.getFlowPoolLevelTag());
                     matchContent.setSourceType(contentItemVO.getSourceType());
                     matchContent.setChannelContentId(contentItemVO.getChannelContentId());
+                    matchContent.setVideoPoolTraceId(contentItemVO.getVideoPoolTraceId());
                     try {
                         matchQueue.put(matchContent);
                     } catch (InterruptedException e) {

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/MatchVideoServiceImpl.java

@@ -7,18 +7,19 @@ import com.tzld.piaoquan.longarticle.common.enums.ContentStatusEnum;
 import com.tzld.piaoquan.longarticle.common.enums.PublicFlagEnum;
 import com.tzld.piaoquan.longarticle.component.RedisLock;
 import com.tzld.piaoquan.longarticle.dao.mapper.aigc.ProducePlanExeRecordMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.LongArticlesTextMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.MatchVideoMapper;
-import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.PromotionSourceMapper;
+import com.tzld.piaoquan.longarticle.dao.mapper.longarticle.*;
 import com.tzld.piaoquan.longarticle.model.bo.MatchContent;
 import com.tzld.piaoquan.longarticle.model.bo.VideoDetail;
+import com.tzld.piaoquan.longarticle.model.dto.AuditContentRequest;
 import com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecord;
 import com.tzld.piaoquan.longarticle.model.po.aigc.ProducePlanExeRecordExample;
 import com.tzld.piaoquan.longarticle.model.po.longarticle.*;
 import com.tzld.piaoquan.longarticle.service.local.KimiService;
+import com.tzld.piaoquan.longarticle.service.remote.MatchService;
 import com.tzld.piaoquan.longarticle.utils.LarkRobotUtil;
 import com.tzld.piaoquan.longarticle.utils.page.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
@@ -75,6 +76,18 @@ public class MatchVideoServiceImpl {
     @Autowired
     private ContentServiceImpl contentService;
 
+    @Autowired
+    private SingleVideoSourceMapper singleVideoSourceMapper;
+
+    @Autowired
+    private VideoContentUnderstandingMapper videoContentUnderstandingMapper;
+
+    @Autowired
+    private CrawlerVideoMapper crawlerVideoMapper;
+
+    @Autowired
+    private MatchService matchService;
+
 
     // 定义一个阻塞队列
     private static final ArrayBlockingQueue<MatchVideo> matchKimiVideoQueue = new ArrayBlockingQueue<>(1000000);
@@ -216,11 +229,72 @@ public class MatchVideoServiceImpl {
         }
     }
 
+    public void addCrawlerVideo(MatchVideo matchVideo) {
+        //数据准备
+        SingleVideoSourceExample example = new SingleVideoSourceExample();
+        example.createCriteria().andContentTraceIdEqualTo(matchVideo.getContentTraceId());
+        List<SingleVideoSource> singleVideoSources = singleVideoSourceMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(singleVideoSources)) {
+            return;
+        }
+        VideoContentUnderstandingExample videoContentUnderstandingExample = new VideoContentUnderstandingExample();
+        videoContentUnderstandingExample.createCriteria().andContentTraceIdEqualTo(matchVideo.getContentTraceId());
+        List<VideoContentUnderstanding> videoContentUnderstandings = videoContentUnderstandingMapper.selectByExample(videoContentUnderstandingExample);
+        if (CollectionUtils.isEmpty(videoContentUnderstandings)) {
+            return;
+        }
+        SingleVideoSource singleVideoSource = singleVideoSources.get(0);
+        VideoContentUnderstanding videoContentUnderstanding = videoContentUnderstandings.get(0);
+
+
+        //视频抓取表插入
+        CrawlerVideo crawlerVideo = new CrawlerVideo();
+        crawlerVideo.setDownloadStatus(2);
+        crawlerVideo.setVideoTitle(singleVideoSource.getArticleTitle());
+        crawlerVideo.setCoverUrl(singleVideoSource.getCoverUrl());
+        crawlerVideo.setVideoOssPath(singleVideoSource.getVideoOssPath());
+        crawlerVideo.setCrawlerTime(new Date(singleVideoSource.getCrawlerTimestamp() * 1000));
+        crawlerVideo.setContentId(matchVideo.getContentId());
+        crawlerVideoMapper.insertSelective(crawlerVideo);
+
+        //kimi插入
+        LongArticlesTextExample longArticlesTextExample = new LongArticlesTextExample();
+        longArticlesTextExample.createCriteria().andContentIdEqualTo(matchVideo.getContentId());
+        List<LongArticlesText> longArticlesTexts = longArticlesTextMapper.selectByExampleWithBLOBs(longArticlesTextExample);
+        LongArticlesText longArticlesText = longArticlesTexts.get(0);
+        longArticlesText.setKimiTitle(videoContentUnderstanding.getArticleText());
+        longArticlesText.setKimiStatus(ContentResultStatusEnum.SUCCESS.getStatus());
+        longArticlesText.setResultStatus(ContentResultStatusEnum.SUCCESS.getStatus());
+        longArticlesTextMapper.updateByPrimaryKeyWithBLOBs(longArticlesText);
+
+        //修改视频匹配表状态
+        matchVideo.setContentStatus(ContentStatusEnum.SUCCESS_3.getStatusCode());
+        matchVideoMapper.updateByPrimaryKey(matchVideo);
+
+
+        //增加审核
+        AuditContentRequest auditContentRequest = new AuditContentRequest();
+        auditContentRequest.setContentId(matchVideo.getContentId());
+        auditContentRequest.setFlowPoolLevel(matchVideo.getFlowPoolLevel());
+        boolean addAudit = matchService.addAudit(auditContentRequest);
+        if (!addAudit) {
+            LarkRobotUtil.sendMessage("添加审核文章失败 contentId=" + matchVideo.getContentId() +
+                    " flowPoolLevel=" + matchVideo.getFlowPoolLevel());
+        }
+
+
+    }
 
     public void processKimiMatchContent(MatchVideo matchVideo) {
         if (matchVideo.getContentStatus() != ContentStatusEnum.DEFAULT.getStatusCode()) {
             return;
         }
+
+        if (StringUtils.isNotEmpty(matchVideo.getContentTraceId())) {
+            addCrawlerVideo(matchVideo);
+            return;
+        }
+
         //1.执行kimi任务
         LongArticlesText kimiText = kimiService.getKimiText(matchVideo.getContentId());
         if (kimiText == null) {

long-article-server/src/main/resources/mapper/longarticle/MatchVideoMapper.xml

@@ -8,6 +8,7 @@
     <result column="flow_pool_level" jdbcType="VARCHAR" property="flowPoolLevel" />
     <result column="gh_id" jdbcType="VARCHAR" property="ghId" />
     <result column="account_name" jdbcType="VARCHAR" property="accountName" />
+    <result column="content_trace_id" jdbcType="VARCHAR" property="contentTraceId" />
     <result column="content_status" jdbcType="INTEGER" property="contentStatus" />
     <result column="content_status_update_time" jdbcType="INTEGER" property="contentStatusUpdateTime" />
     <result column="success_status" jdbcType="INTEGER" property="successStatus" />
@@ -78,8 +79,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, trace_id, content_id, flow_pool_level, gh_id, account_name, content_status, content_status_update_time, 
-    success_status, request_timestamp, update_time, process_times, publish_flag
+    id, trace_id, content_id, flow_pool_level, gh_id, account_name, content_trace_id, 
+    content_status, content_status_update_time, success_status, request_timestamp, update_time, 
+    process_times, publish_flag
   </sql>
   <sql id="Blob_Column_List">
     response
@@ -141,13 +143,13 @@
   <insert id="insert" parameterType="com.tzld.piaoquan.longarticle.model.po.longarticle.MatchVideo">
     insert into long_articles_match_videos (id, trace_id, content_id, 
       flow_pool_level, gh_id, account_name, 
-      content_status, content_status_update_time, 
+      content_trace_id, content_status, content_status_update_time, 
       success_status, request_timestamp, update_time, 
       process_times, publish_flag, response
       )
     values (#{id,jdbcType=INTEGER}, #{traceId,jdbcType=VARCHAR}, #{contentId,jdbcType=VARCHAR}, 
       #{flowPoolLevel,jdbcType=VARCHAR}, #{ghId,jdbcType=VARCHAR}, #{accountName,jdbcType=VARCHAR}, 
-      #{contentStatus,jdbcType=INTEGER}, #{contentStatusUpdateTime,jdbcType=INTEGER}, 
+      #{contentTraceId,jdbcType=VARCHAR}, #{contentStatus,jdbcType=INTEGER}, #{contentStatusUpdateTime,jdbcType=INTEGER}, 
       #{successStatus,jdbcType=INTEGER}, #{requestTimestamp,jdbcType=INTEGER}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{processTimes,jdbcType=INTEGER}, #{publishFlag,jdbcType=INTEGER}, #{response,jdbcType=LONGVARCHAR}
       )
@@ -173,6 +175,9 @@
       <if test="accountName != null">
         account_name,
       </if>
+      <if test="contentTraceId != null">
+        content_trace_id,
+      </if>
       <if test="contentStatus != null">
         content_status,
       </if>
@@ -217,6 +222,9 @@
       <if test="accountName != null">
         #{accountName,jdbcType=VARCHAR},
       </if>
+      <if test="contentTraceId != null">
+        #{contentTraceId,jdbcType=VARCHAR},
+      </if>
       <if test="contentStatus != null">
         #{contentStatus,jdbcType=INTEGER},
       </if>
@@ -270,6 +278,9 @@
       <if test="record.accountName != null">
         account_name = #{record.accountName,jdbcType=VARCHAR},
       </if>
+      <if test="record.contentTraceId != null">
+        content_trace_id = #{record.contentTraceId,jdbcType=VARCHAR},
+      </if>
       <if test="record.contentStatus != null">
         content_status = #{record.contentStatus,jdbcType=INTEGER},
       </if>
@@ -307,6 +318,7 @@
       flow_pool_level = #{record.flowPoolLevel,jdbcType=VARCHAR},
       gh_id = #{record.ghId,jdbcType=VARCHAR},
       account_name = #{record.accountName,jdbcType=VARCHAR},
+      content_trace_id = #{record.contentTraceId,jdbcType=VARCHAR},
       content_status = #{record.contentStatus,jdbcType=INTEGER},
       content_status_update_time = #{record.contentStatusUpdateTime,jdbcType=INTEGER},
       success_status = #{record.successStatus,jdbcType=INTEGER},
@@ -327,6 +339,7 @@
       flow_pool_level = #{record.flowPoolLevel,jdbcType=VARCHAR},
       gh_id = #{record.ghId,jdbcType=VARCHAR},
       account_name = #{record.accountName,jdbcType=VARCHAR},
+      content_trace_id = #{record.contentTraceId,jdbcType=VARCHAR},
       content_status = #{record.contentStatus,jdbcType=INTEGER},
       content_status_update_time = #{record.contentStatusUpdateTime,jdbcType=INTEGER},
       success_status = #{record.successStatus,jdbcType=INTEGER},
@@ -356,6 +369,9 @@
       <if test="accountName != null">
         account_name = #{accountName,jdbcType=VARCHAR},
       </if>
+      <if test="contentTraceId != null">
+        content_trace_id = #{contentTraceId,jdbcType=VARCHAR},
+      </if>
       <if test="contentStatus != null">
         content_status = #{contentStatus,jdbcType=INTEGER},
       </if>
@@ -390,6 +406,7 @@
       flow_pool_level = #{flowPoolLevel,jdbcType=VARCHAR},
       gh_id = #{ghId,jdbcType=VARCHAR},
       account_name = #{accountName,jdbcType=VARCHAR},
+      content_trace_id = #{contentTraceId,jdbcType=VARCHAR},
       content_status = #{contentStatus,jdbcType=INTEGER},
       content_status_update_time = #{contentStatusUpdateTime,jdbcType=INTEGER},
       success_status = #{successStatus,jdbcType=INTEGER},
@@ -407,6 +424,7 @@
       flow_pool_level = #{flowPoolLevel,jdbcType=VARCHAR},
       gh_id = #{ghId,jdbcType=VARCHAR},
       account_name = #{accountName,jdbcType=VARCHAR},
+      content_trace_id = #{contentTraceId,jdbcType=VARCHAR},
       content_status = #{contentStatus,jdbcType=INTEGER},
       content_status_update_time = #{contentStatusUpdateTime,jdbcType=INTEGER},
       success_status = #{successStatus,jdbcType=INTEGER},