Merge branch 'master' into wyp/0207-badAccountContentReject

# Conflicts:
#	long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/aigc/AigcBaseMapper.java

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/aigc/AigcBaseMapper.java

@@ -47,6 +47,8 @@ public interface AigcBaseMapper {
 
     Long getProduceContentCountByProducePlanIds(List<String> producePlanIds, Long start, Long end);
 
+    Long getProduceAuditPassCountByProducePlanIds(List<String> producePlanIds, List<Integer> auditStatus, Long start, Long end);
+
     Long getProduceAuditPassCountByProducePlanIds(List<String> producePlanIds, Long start, Long end);
 
     List<String> getPlanExeIdByAccountName(List<String> accountNames);

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

@@ -10,7 +10,13 @@ public class ContentFunnelExport {
     private Long crawlerCount = 0L;
     private Long produceCount = 0L;
     private Long produceAuditPassCount = 0L;
+    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

@@ -2105,8 +2105,13 @@ public class DataDashboardService {
             }
         }
 
+        List<Pair<String, String>> styles = Arrays
+                .asList(
+                        Pair.of("G", "0.00%"),
+                        Pair.of("K", "0.00%")
+                );
         doSendFeishuSheet(dateStrList, dailyDetailSheetToken, "qEipyL", rowNum, rows,
-                2, null, null);
+                2, styles, null);
     }
 
     private ContentFunnelExport buildContentFunnelExport(String dateStr) {
@@ -2135,20 +2140,33 @@ public class DataDashboardService {
             planCrawlerCount += inputModeValues.size();
         }
         Long produceCount = aigcBaseMapper.getProduceContentCountByProducePlanIds(producePlanIds, start, end);
-        Long produceAuditPassCount = aigcBaseMapper.getProduceAuditPassCountByProducePlanIds(producePlanIds, start, end);
+        List<Integer> auditStatus = new ArrayList<>();
+        auditStatus.add(1);
+        Long produceAuditPassCount = aigcBaseMapper.getProduceAuditPassCountByProducePlanIds(producePlanIds, auditStatus, start, end);
+        auditStatus.add(2);
+        Long produceAuditCount = aigcBaseMapper.getProduceAuditPassCountByProducePlanIds(producePlanIds, auditStatus, start, end);
         Date dateStart = DateUtils.getStartDateOfDay(start / 1000);
         Date dateEnd = DateUtils.getStartDateOfDay(end / 1000);
         Long matchSuccessCount = longArticleBaseMapper.countMatchSuccessCount(dateStart, dateEnd);
         Long videoAuditPassCount = longArticleTitleAuditRepository.countByStatusAndAuditTimestampBetween(
                 1, start, end);
+        Long videoAuditCount = longArticleTitleAuditRepository.countByAuditTimestampBetween(start, end);
 
         result.setDateStr(dateStr);
         result.setPlanCrawlerCount(planCrawlerCount);
         result.setCrawlerCount(crawlerCount);
         result.setProduceCount(produceCount);
         result.setProduceAuditPassCount(produceAuditPassCount);
+        result.setProduceAuditCount(produceAuditCount);
+        if (produceAuditCount > 0) {
+            result.setProduceAuditPassRate(produceAuditPassCount * 1.0 / produceAuditCount);
+        }
         result.setMatchSuccessCount(matchSuccessCount);
         result.setVideoAuditPassCount(videoAuditPassCount);
+        result.setVideoAuditCount(videoAuditCount);
+        if (videoAuditCount > 0) {
+            result.setVideoAuditPassRate(videoAuditPassCount * 1.0 / videoAuditCount);
+        }
         return result;
     }
 

long-article-recommend-service/src/main/resources/mapper/aigc/AigcBaseMapper.xml

@@ -193,7 +193,10 @@
         <foreach collection="producePlanIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
-        and audit_status = 1
+        and audit_status in
+        <foreach collection="auditStatus" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
         and audit_timestamp between #{start} and #{end}
     </select>