Merge branch 'wyp/1115-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

@@ -90,12 +90,16 @@ public class DatastatSortStrategy implements Serializable {
     private Double hisFission0FirstRate;
     @Column(name = "gh_id")
     private String ghId;
+    @Column(name = "account_create_timestamp")
+    private Long accountCreateTimestamp;
     @Column(name = "title")
     private String title;
     @Column(name = "link")
     private String link;
     @Column(name = "wx_sn")
     private String wxSn;
+    @Column(name = "publish_timestamp")
+    private Long publishTimestamp;
     @Column(name = "fission0_read_avg_100_rate")
     private Double fission0ReadAvg100Rate;
     @Column(name = "fission0_read_avg_500_rate")

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

@@ -49,6 +49,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.lang.reflect.Field;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -160,6 +161,7 @@ public class DataDashboardService {
                 Collectors.groupingBy(Article::getAppMsgId, Collectors.toMap(Article::getItemIndex, o -> o))));
         log.info("newSortStrategyData articleList finish");
         Set<String> snList = articleList.stream().map(Article::getWxSn).collect(Collectors.toSet());
+        Map<String, Article> wxSnMap = articleList.stream().collect(Collectors.toMap(Article::getWxSn, Function.identity()));
         List<ArticleDetailInfo> articleDetailInfoList = new ArrayList<>();
         for (List<String> partitions : Lists.partition(new ArrayList<>(snList), 1000)) {
             articleDetailInfoList.addAll(articleDetailInfoRepository.getAllByWxSnIn(partitions));
@@ -342,6 +344,10 @@ public class DataDashboardService {
             for (NewSortStrategyExport newSortStrategyExport : result) {
                 DatastatSortStrategy item = new DatastatSortStrategy();
                 BeanUtils.copyProperties(newSortStrategyExport, item);
+                PublishAccount publishAccount = publishAccountMap.get(item.getGhId());
+                item.setAccountCreateTimestamp(publishAccount.getCreateTimestamp() / 1000);
+                Article article = wxSnMap.get(item.getWxSn());
+                item.setPublishTimestamp(article.getPublishTimestamp());
                 saveList.add(item);
             }
             for (List<DatastatSortStrategy> saveListPartition : Lists.partition(saveList, 1000)) {

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

@@ -21,7 +21,7 @@
         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)
+        source_produce_plan_name, account_create_timestamp, publish_timestamp)
         VALUES
         <foreach collection="list" item="item" separator=",">
             (#{item.dateStr}, #{item.publishTime}, #{item.accountMode}, #{item.accountSource}, #{item.accountType},
@@ -37,7 +37,7 @@
             #{item.fission0ReadAvg1000Rate}, #{item.crawlerPlanName}, #{item.crawlerPlanTag},
             #{item.producePlanName}, #{item.producePlanTag}, #{item.publishPlanName},
             #{item.publishMiniProgramInsertStrategy}, #{item.publishMiniProgramInsertUseType},
-            #{item.publishMiniProgramNum}, #{item.sourceProducePlanName})
+            #{item.publishMiniProgramNum}, #{item.sourceProducePlanName}, #{item.accountCreateTimestamp}, #{item.publishTimestamp})
         </foreach>
     </insert>