Merge branch 'wyp/1014-data-export' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/DatastatSortStrategy.java

@@ -82,6 +82,12 @@ public class DatastatSortStrategy implements Serializable {
     private Double fission1Fission0Rate;
     @Column(name = "fission0_read_avg_rate")
     private Double fission0ReadAvgRate;
+    @Column(name = "his_read_rate")
+    private Double hisReadRate;
+    @Column(name = "his_first_read_rate")
+    private Double hisFirstReadRate;
+    @Column(name = "his_fission0_first_rate")
+    private Double hisFission0FirstRate;
     @Column(name = "gh_id")
     private String ghId;
     @Column(name = "title")
@@ -112,6 +118,8 @@ public class DatastatSortStrategy implements Serializable {
     private String publishMiniProgramInsertUseType;
     @Column(name = "publish_mini_program_num")
     private Integer publishMiniProgramNum;
+    @Column(name = "source_produce_plan_name")
+    private String sourceProducePlanName;
 
 
     @Data

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

@@ -42,7 +42,7 @@ public class NewSortStrategyExport {
     private Double fission0ReadAvgRate = 0.0;
     //历史信息
     private Double hisReadRate = 0.0;
-    private Double hisFirstFansRate = 0.0;
+    private Double hisFirstReadRate = 0.0;
     private Double hisFission0FirstRate = 0.0;
 
     private Integer position;

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

@@ -462,7 +462,6 @@ public class DataDashboardService {
                             && !ScoreStrategy.hisContentLateFilter(o.getUpdateTime())).collect(Collectors.toList());
             Integer readCount = 0;
             Double readAvgCount = 0.0;
-            Integer fansCount = 0;
             int firstCount = 0;
             int fission0Count = 0;
             for (Article hisArticle : hisArticles) {
@@ -471,7 +470,6 @@ public class DataDashboardService {
                         hisArticle.getUpdateTime(), hisArticle.getItemIndex());
                 if (Objects.nonNull(accountAvgInfo)) {
                     readAvgCount += accountAvgInfo.getReadAvg();
-                    fansCount += accountAvgInfo.getFans();
                 }
                 List<ArticleDetailInfo> hisADIList = hisArticleDetailInfoMap.get(hisArticle.getWxSn());
                 if (CollectionUtil.isNotEmpty(hisADIList)) {
@@ -491,8 +489,8 @@ public class DataDashboardService {
             if (readAvgCount > 0) {
                 obj.setHisReadRate(readCount / readAvgCount);
             }
-            if (fansCount > 0) {
-                obj.setHisFirstFansRate(firstCount / (double) fansCount);
+            if (readCount > 0) {
+                obj.setHisFirstReadRate(firstCount / (double) readCount);
             }
             if (firstCount > 0) {
                 obj.setHisFission0FirstRate(fission0Count / (double) firstCount);

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

@@ -13,10 +13,11 @@
         first_level, fission0, fission1, fission2, second_first_level, second_fission0, second_fission1,
         second_fission2, third_first_level, third_fission0, third_fission1, third_fission2,
         read_rate, read_fans_rate, first_read_rate, fission0_first_rate, fission1_fission0_rate,
-        fission0_read_avg_rate, position, gh_id, title, link, wx_sn, fission0_read_avg_100_rate,
-        fission0_read_avg_500_rate, fission0_read_avg_1000_rate, crawler_plan_name, crawler_plan_tag,
-        produce_plan_name, produce_plan_tag, publish_plan_name, publish_mini_program_insert_strategy,
-        publish_mini_program_insert_use_type, publish_mini_program_num)
+        fission0_read_avg_rate, his_read_rate, his_first_read_rate, his_fission0_first_rate, position, gh_id, title,
+        link, wx_sn, fission0_read_avg_100_rate, fission0_read_avg_500_rate, fission0_read_avg_1000_rate,
+        crawler_plan_name, crawler_plan_tag, produce_plan_name, produce_plan_tag, publish_plan_name,
+        publish_mini_program_insert_strategy, publish_mini_program_insert_use_type, publish_mini_program_num,
+        source_produce_plan_name)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.dateStr}, #{item.publishTime}, #{item.accountMode}, #{item.accountSource}, #{item.accountType},
@@ -26,12 +27,13 @@
             #{item.secondFission0}, #{item.secondFission1}, #{item.secondFission2}, #{item.thirdFirstLevel},
             #{item.thirdFission0}, #{item.thirdFission1}, #{item.thirdFission2}, #{item.readRate},
             #{item.readFansRate}, #{item.firstReadRate}, #{item.fission0FirstRate}, #{item.fission1Fission0Rate},
-            #{item.fission0ReadAvgRate}, #{item.position}, #{item.ghId}, #{item.title}, #{item.link},
+            #{item.fission0ReadAvgRate}, #{item.hisReadRate}, #{item.hisFirstReadRate}, #{item.hisFission0FirstRate},
+            #{item.position}, #{item.ghId}, #{item.title}, #{item.link},
             #{item.wxSn}, #{item.fission0ReadAvg100Rate}, #{item.fission0ReadAvg500Rate},
             #{item.fission0ReadAvg1000Rate}, #{item.crawlerPlanName}, #{item.crawlerPlanTag},
             #{item.producePlanName}, #{item.producePlanTag}, #{item.publishPlanName},
             #{item.publishMiniProgramInsertStrategy}, #{item.publishMiniProgramInsertUseType},
-            #{item.publishMiniProgramNum})
+            #{item.publishMiniProgramNum}, #{item.sourceProducePlanName})
         </foreach>
     </insert>