Merge branch 'master' into wyp/1029-rootId

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

@@ -1460,9 +1460,12 @@ public class DataDashboardService {
                 }
             }
             List<PublishContent> hisPublish = hisPublishMap.get(article.getTitle());
-            long hisMinDate = hisPublish.stream().mapToLong(PublishContent::getPublishTimestamp).min().orElse(0);
-            int explorationInterval = (int) ((article.getUpdateTime() - (hisMinDate / 1000)) / 86400);
-            item.setFirstExplorationIntervalAvg(explorationInterval);
+            if (CollectionUtils.isNotEmpty(hisPublish)) {
+                long hisMinDate = hisPublish.stream().filter(o -> Objects.nonNull(o.getPublishTimestamp()))
+                        .mapToLong(PublishContent::getPublishTimestamp).min().orElse(0);
+                int explorationInterval = (int) ((article.getUpdateTime() - (hisMinDate / 1000)) / 86400);
+                item.setFirstExplorationIntervalAvg(explorationInterval);
+            }
             result.add(item);
         }
         saveDatastatScore(dateStrList, result);

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

@@ -67,7 +67,7 @@
             (#{item.dt}, #{item.ghId}, #{item.accountName}, #{item.index}, #{item.title}, #{item.strategy},
              #{item.score}, #{item.similarity}, #{item.viewCountRate}, #{item.hisFissionAvgReadRateRate},
             #{item.hisFissionAvgReadSumRate}, #{item.hisFissionDeWeightAvgReadSumRate}, #{item.readCount},
-             #{item.readAvg}, #{item.readAvg})
+             #{item.readAvg}, #{item.readAvgRate})
         </foreach>
     </insert>