Merge branch 'wyp/0212-contentFunnel' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/longArticle/LongArticleBaseMapper.java

@@ -78,5 +78,7 @@ public interface LongArticleBaseMapper {
 
     Long countMatchSuccessCount(Date start, Date end);
 
+    Long countMatchCount(Date start, Date end);
+
     void batchInsertLongArticleAuditDelete(List<LongArticleAuditDelete> deleteList);
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/vo/ContentFunnelExport.java

@@ -13,6 +13,8 @@ public class ContentFunnelExport {
     private Long produceAuditCount = 0L;
     private Double produceAuditPassRate = 0.0;
     private Long matchSuccessCount = 0L;
+    private Long matchCount = 0L;
+    private Double matchSuccessRate = 0.0;
     private Long videoAuditPassCount = 0L;
     private Long videoAuditCount = 0L;
     private Double videoAuditPassRate = 0.0;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/DataDashboardService.java

@@ -2120,7 +2120,8 @@ public class DataDashboardService {
         List<Pair<String, String>> styles = Arrays
                 .asList(
                         Pair.of("G", "0.00%"),
-                        Pair.of("K", "0.00%")
+                        Pair.of("J", "0.00%"),
+                        Pair.of("M", "0.00%")
                 );
         doSendFeishuSheet(dateStrList, dailyDetailSheetToken, "qEipyL", rowNum, rows,
                 2, styles, null);
@@ -2160,6 +2161,7 @@ public class DataDashboardService {
         Date dateStart = DateUtils.getStartDateOfDay(start / 1000);
         Date dateEnd = DateUtils.getStartDateOfDay(end / 1000);
         Long matchSuccessCount = longArticleBaseMapper.countMatchSuccessCount(dateStart, dateEnd);
+        Long matchCount = longArticleBaseMapper.countMatchCount(dateStart, dateEnd);
         Long videoAuditPassCount = longArticleTitleAuditRepository.countByStatusAndAuditTimestampBetween(
                 1, start, end);
         Long videoAuditCount = longArticleTitleAuditRepository.countByAuditTimestampBetween(start, end);
@@ -2174,6 +2176,10 @@ public class DataDashboardService {
             result.setProduceAuditPassRate(produceAuditPassCount * 1.0 / produceAuditCount);
         }
         result.setMatchSuccessCount(matchSuccessCount);
+        result.setMatchCount(matchCount);
+        if (matchCount > 0) {
+            result.setMatchSuccessRate(matchSuccessCount * 1.0 / matchCount);
+        }
         result.setVideoAuditPassCount(videoAuditPassCount);
         result.setVideoAuditCount(videoAuditCount);
         if (videoAuditCount > 0) {

long-article-recommend-service/src/main/resources/mapper/longArticle/LongArticleBaseMapper.xml

@@ -272,9 +272,15 @@
     </select>
 
     <select id="countMatchSuccessCount" resultType="java.lang.Long">
-        select count(distinct content_id)
-        from long_articles_crawler_videos
-        where crawler_time between #{start} and #{end}
+        select count(content_id)
+        from long_articles_text
+        where start_processing_time between #{start} and #{end} and result_status = 1
+    </select>
+
+    <select id="countMatchCount" resultType="java.lang.Long">
+        select count(content_id)
+        from long_articles_text
+        where start_processing_time between #{start} and #{end}
     </select>
 
     <insert id="batchInsertLongArticleAuditDelete">