历史发布记录增加 历史特征、首条阅读均值倍数

增加低评分过滤

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

@@ -2,7 +2,6 @@ package com.tzld.longarticle.recommend.server;
 
 
 import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
-import org.mybatis.spring.annotation.MapperScan;
 import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -26,7 +25,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
         "com.tzld.longarticle.recommend.server.util",
         "com.tzld.longarticle.recommend.server.repository",
 })
-@MapperScan("com.tzld.longarticle.recommend.server.repository.mapper")
 @EnableAspectJAutoProxy
 @EnableApolloConfig
 public class Application {

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

@@ -15,7 +15,7 @@ public final class ThreadPoolFactory {
             32,
             128,
             0L, TimeUnit.SECONDS,
-            new LinkedBlockingQueue<>(1000),
+            new LinkedBlockingQueue<>(10000),
             new ThreadFactoryBuilder().setNameFormat("DEFAULT-%d").build(),
             new ThreadPoolExecutor.AbortPolicy());
     public final static ExecutorService RECALL = new CommonThreadPoolExecutor(

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/db/AdplatformDBConfig.java

@@ -47,7 +47,7 @@ public class AdplatformDBConfig {
 
     @Bean(name = "adplatformEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean adplatformEntityManagerFactory(EntityManagerFactoryBuilder builder,
-                                                                                @Qualifier("adplatformDataSource") DataSource dataSource) {
+                                                                                 @Qualifier("adplatformDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
                 .packages("com.tzld.longarticle.recommend.server.repository.entity.adplatform") // 实体类包路径

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/db/AigcDBConfig.java

@@ -47,7 +47,7 @@ public class AigcDBConfig {
 
     @Bean(name = "aigcEntityManagerFactory")
     public LocalContainerEntityManagerFactoryBean aigcEntityManagerFactory(EntityManagerFactoryBuilder builder,
-                                                                                @Qualifier("aigcDataSource") DataSource dataSource) {
+                                                                           @Qualifier("aigcDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
                 .packages("com.tzld.longarticle.recommend.server.repository.entity.aigc") // 实体类包路径

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

@@ -1,19 +1,27 @@
 package com.tzld.longarticle.recommend.server.model;
 
+import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleDetailInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class ContentHisPublishArticle {
 
     private String ghId;
     private String accountName;
+    private String msgId;
     private String title;
     private Integer itemIndex;
-    private Integer showViewCount;
+    private Integer viewCount;
     private Long updateTime;
     private Integer avgViewCount;
     private Double viewCountRate;
-    private boolean isInnerAccount;
+    private Integer firstViewCount;
+    private Double firstViewCountRate;
+    private boolean isInnerAccount = false;
+
+    private List<ArticleDetailInfo> articleDetailInfoList;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/crawler/AccountAvgInfoRepository.java

@@ -4,7 +4,11 @@ import com.tzld.longarticle.recommend.server.repository.entity.crawler.AccountAv
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Set;
+
 @Repository
 public interface AccountAvgInfoRepository extends JpaRepository<AccountAvgInfo, AccountAvgInfo.PK> {
 
+    List<AccountAvgInfo> getAllByGhIdIn(Set<String> ghIds);
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/crawler/ArticleDetailInfoRepository.java

@@ -0,0 +1,14 @@
+package com.tzld.longarticle.recommend.server.repository.crawler;
+
+import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleDetailInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Set;
+
+@Repository
+public interface ArticleDetailInfoRepository extends JpaRepository<ArticleDetailInfo, ArticleDetailInfo.PK> {
+
+    List<ArticleDetailInfo> getAllByWxSnIn(Set<String> wxSnList);
+}

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/crawler/ArticleRepository.java

@@ -5,12 +5,15 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Set;
 
 @Repository
 public interface ArticleRepository extends JpaRepository<Article, String> {
 
     List<Article> getByAccountNameAndItemIndexInAndTypeEquals(String accountName, List<Integer> indexList, String type);
 
-    List<Article> getByTitleIn(List<String> titleList);
+    List<Article> getByTitleIn(Set<String> titleList);
+
+    List<Article> getByGhIdInAndAppMsgIdInAndItemIndex(Set<String> ghIds, Set<String> appMsgIds, Integer itemIndex);
 
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/crawler/AccountAvgInfo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "account_avg_info")
+@Table(name = "account_avg_info_v2")
 @IdClass(AccountAvgInfo.PK.class)
 public class AccountAvgInfo implements Serializable {
 
@@ -26,9 +26,9 @@ public class AccountAvgInfo implements Serializable {
     @Column(name = "fans")
     private long fans;
     @Column(name = "read_avg")
-    private double readAvg;
+    private Double readAvg;
     @Column(name = "like_avg")
-    private double likeAvg;
+    private Double likeAvg;
 
     @Data
     public static class PK implements Serializable {

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/crawler/ArticleDetailInfo.java

@@ -0,0 +1,63 @@
+package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "long_articles_detail_info")
+@IdClass(ArticleDetailInfo.PK.class)
+public class ArticleDetailInfo implements Serializable {
+
+    @Id
+    @Column(name = "wx_sn")
+    private String wxSn;
+    @Id
+    @Column(name = "recall_dt")
+    private Date recallDt;
+    @Id
+    @Column(name = "video_id")
+    private Long videoId;
+    @Column(name = "mini_title")
+    private String miniTitle;
+    @Column(name = "mini_name")
+    private String miniName;
+    @Column(name = "cover_url")
+    private String coverUrl;
+    @Column(name = "video_index")
+    private Integer videoIndex;
+    @Column(name = "root_source_id")
+    private String rootSourceId;
+    @Column(name = "publish_dt")
+    private Date publishDt;
+    @Column(name = "first_level")
+    private Integer firstLevel;
+    @Column(name = "fission_0")
+    private Integer fission0;
+    @Column(name = "fission_1")
+    private Integer fission1;
+    @Column(name = "fission_2")
+    private Integer fission2;
+
+    @Data
+    public static class PK implements Serializable {
+
+        @Column(name = "wx_sn")
+        private String wxSn;
+        @Column(name = "recall_dt")
+        private Date recallDt;
+        @Column(name = "video_id")
+        private Long videoId;
+
+        public PK() {
+        }
+
+    }
+}

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/mapper/adplatform/AdplatformBaseMapper.java

@@ -1,5 +1,8 @@
 package com.tzld.longarticle.recommend.server.repository.mapper.adplatform;
 
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
 public interface AdplatformBaseMapper {
 
 }

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

@@ -1,5 +1,8 @@
 package com.tzld.longarticle.recommend.server.repository.mapper.aigc;
 
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
 public interface AigcBaseMapper {
 
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/strategy/HistoryTitleStrategy.java

@@ -1,8 +1,9 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
+import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
 import com.tzld.longarticle.recommend.server.model.Content;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
+import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
 import com.tzld.longarticle.recommend.server.service.filter.FilterParam;
 import com.tzld.longarticle.recommend.server.service.filter.FilterResult;
@@ -12,11 +13,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -34,6 +40,7 @@ public class HistoryTitleStrategy implements FilterStrategy {
     private static final List<Integer> firstSecondIndex = Arrays.asList(1, 2);
     private static final List<Integer> allIndex = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8);
 
+    private final ExecutorService pool = ThreadPoolFactory.defaultPool();
 
     @Override
     public FilterResult filter(FilterParam param) {
@@ -41,29 +48,56 @@ public class HistoryTitleStrategy implements FilterStrategy {
         FilterResult filterResult = new FilterResult();
         List<String> result = new ArrayList<>();
         List<Content> filterContents = new ArrayList<>();
-        List<Article> firstSecondArticleList = articleListRemoteService.articleList(param.getAccountName(), firstSecondIndex);
-        List<String> firstSecondTitleList = firstSecondArticleList.stream().map(Article::getTitle).distinct().collect(Collectors.toList());
         List<Article> allArticleList = articleListRemoteService.articleList(param.getAccountName(), allIndex);
         List<String> allTitleList = allArticleList.stream().map(Article::getTitle).distinct().collect(Collectors.toList());
+        List<Article> firstSecondArticleList = allArticleList.stream().filter(article -> firstSecondIndex.contains(article.getItemIndex())).collect(Collectors.toList());
+        List<String> firstSecondTitleList = firstSecondArticleList.stream().map(Article::getTitle).distinct().collect(Collectors.toList());
 
         List<String> firstSecondContentPool = new ArrayList<>();
         String[] contentPoolConfig = accountContentPoolConfigService.getContentPools(param.getAccountName());
         if (Objects.nonNull(contentPoolConfig)) {
             firstSecondContentPool = Arrays.asList(contentPoolConfig[0], contentPoolConfig[1]);
         }
+        List<Future<Content>> futures = new ArrayList<>();
+        CountDownLatch cdl = new CountDownLatch(param.getContents().size());
         for (Content content : param.getContents()) {
-            boolean isDuplicate;
-            if (CollectionUtils.isNotEmpty(firstSecondContentPool) && firstSecondContentPool.contains(content.getContentPoolType())) {
-                // 四个内容池 配置 判断头条，次头条
-                isDuplicate = TitleSimilarCheckUtil.isDuplicateContent(content.getTitle(), firstSecondTitleList);
-            } else {
-                isDuplicate = TitleSimilarCheckUtil.isDuplicateContent(content.getTitle(), allTitleList);
-            }
-            if (!isDuplicate) {
-                result.add(content.getId());
-            } else {
-                content.setFilterReason("历史已发布文章");
-                filterContents.add(content);
+            List<String> finalFirstSecondContentPool = firstSecondContentPool;
+            Future<Content> future = pool.submit(() -> {
+                try {
+                    boolean isDuplicate;
+                    if (CollectionUtils.isNotEmpty(finalFirstSecondContentPool) && finalFirstSecondContentPool.contains(content.getContentPoolType())) {
+                        // 四个内容池 配置 判断头条，次头条
+                        isDuplicate = TitleSimilarCheckUtil.isDuplicateContent(content.getTitle(), firstSecondTitleList);
+                    } else {
+                        isDuplicate = TitleSimilarCheckUtil.isDuplicateContent(content.getTitle(), allTitleList);
+                    }
+                    if (isDuplicate) {
+                        content.setFilterReason("历史已发布文章");
+                    }
+                    return content;
+                } finally {
+                    cdl.countDown();
+                }
+            });
+            futures.add(future);
+        }
+        try {
+            cdl.await(5000, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            log.error("filter error", e);
+            return null;
+        }
+
+        for (Future<Content> f : futures) {
+            try {
+                Content content = f.get();
+                if (StringUtils.hasText(content.getFilterReason())) {
+                    filterContents.add(content);
+                } else {
+                    result.add(content.getId());
+                }
+            } catch (Exception e) {
+                log.error("future get error ", e);
             }
         }
         filterResult.setContentIds(result);

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/strategy/LowScoreStrategy.java

@@ -0,0 +1,93 @@
+package com.tzld.longarticle.recommend.server.service.filter.strategy;
+
+import com.tzld.longarticle.recommend.server.model.Content;
+import com.tzld.longarticle.recommend.server.model.ContentHisPublishArticle;
+import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.filter.FilterStrategy;
+import com.tzld.longarticle.recommend.server.service.score.Score;
+import com.tzld.longarticle.recommend.server.util.MathUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class LowScoreStrategy implements FilterStrategy {
+
+    @Autowired
+    AccountIndexAvgViewCountService accountIndexAvgViewCountService;
+    @Autowired
+    AccountContentPoolConfigService accountContentPoolConfigService;
+
+    @Override
+    public FilterResult filter(FilterParam param) {
+        long start = System.currentTimeMillis();
+        FilterResult filterResult = new FilterResult();
+        if (param.getContents().size() <= 1000) {
+            filterResult.setContentIds(param.getContents().stream().map(Content::getId).collect(Collectors.toList()));
+            return filterResult;
+        }
+        filterResult.setContentIds(new ArrayList<>());
+        List<Score> scores = new ArrayList<>();
+        Map<String, Content> contentMap = param.getContents().stream().collect(Collectors.toMap(Content::getId, c -> c));
+        for (Content content : param.getContents()) {
+            String[] contentPools = accountContentPoolConfigService.getContentPools(param.getAccountName());
+            if (!contentPools[2].equals(content.getContentPoolType())) {
+                filterResult.getContentIds().add(content.getId());
+                continue;
+            }
+            if (CollectionUtils.isEmpty(content.getHisPublishArticleList())) {
+                filterResult.getContentIds().add(content.getId());
+                continue;
+            }
+            double avgViewCountPos = accountIndexAvgViewCountService.getAvgReadCount(param.getGhId(), 3);
+            double showViewCountSum = 0D;
+            double avgViewCountSum = 0D;
+            for (ContentHisPublishArticle hisItem : content.getHisPublishArticleList()) {
+                if (hisItem.isInnerAccount() && Objects.nonNull(hisItem.getViewCount())
+                        && hisItem.getViewCount() > 0 && Objects.nonNull(hisItem.getAvgViewCount())
+                        && hisItem.getAvgViewCount() > 0) {
+                    if (!(hisItem.getItemIndex() == 1) && !(hisItem.getItemIndex() == 2)) {
+                        showViewCountSum += hisItem.getViewCount();
+                        avgViewCountSum += hisItem.getAvgViewCount();
+                    }
+                }
+            }
+            double viewCountRate = 0D; // 设置默认值
+            double minRate = 5D;
+            if (avgViewCountSum > 0) {
+                viewCountRate = showViewCountSum / avgViewCountSum;
+            }
+            double viewCountRateW = MathUtils.sigmoid(avgViewCountSum, 0.0005, avgViewCountPos);
+            double viewCountRateScore = 0;
+            if (viewCountRate > 0) {
+                viewCountRateScore = (Math.min(viewCountRate, minRate) - 1D) * viewCountRateW;
+            }
+            Score score = new Score();
+            score.setContentId(content.getId());
+            score.setScore(viewCountRateScore);
+            scores.add(score);
+        }
+        scores.sort((o1, o2) -> -(o1.getScore().compareTo(o2.getScore())));
+        filterResult.getContentIds().addAll(scores.subList(0, Math.min(100, scores.size())).stream()
+                .map(Score::getContentId).collect(Collectors.toList()));
+        if (scores.size() > 100) {
+            List<Content> filterContent = scores.subList(100, scores.size() - 1).stream()
+                    .map(o -> contentMap.get(o.getContentId())).collect(Collectors.toList());
+            filterContent.forEach(o -> o.setFilterReason("低评分内容"));
+            filterResult.setFilterContent(filterContent);
+        }
+        log.info("LowScoreStrategy cost:{}", System.currentTimeMillis() - start);
+        return filterResult;
+    }
+}

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

@@ -5,12 +5,16 @@ import com.tzld.longarticle.recommend.server.model.Content;
 import com.tzld.longarticle.recommend.server.model.ContentHisPublishArticle;
 import com.tzld.longarticle.recommend.server.remote.AIGCRemoteService;
 import com.tzld.longarticle.recommend.server.repository.aigc.CrawlerMetaArticleRepository;
+import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
+import com.tzld.longarticle.recommend.server.repository.crawler.ArticleDetailInfoRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
 import com.tzld.longarticle.recommend.server.repository.entity.aigc.CrawlerMetaArticle;
+import com.tzld.longarticle.recommend.server.repository.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
+import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleDetailInfo;
+import com.tzld.longarticle.recommend.server.repository.mapper.crawler.CrawlerBaseMapper;
 import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
 import com.tzld.longarticle.recommend.server.service.recall.strategy.DefaultRecallStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AvgReadDTO;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
 import com.tzld.longarticle.recommend.server.util.Md5Util;
@@ -41,11 +45,17 @@ public class RecallService implements ApplicationContextAware {
     @Autowired
     ArticleRepository articleRepository;
     @Autowired
+    AccountAvgInfoRepository accountAvgInfoRepository;
+    @Autowired
+    ArticleDetailInfoRepository articleDetailInfoRepository;
+    @Autowired
     CrawlerMetaArticleRepository crawlerMetaArticleRepository;
     @Autowired
     AIGCRemoteService aigcRemoteService;
     @Autowired
     AccountIndexAvgViewCountService accountIndexAvgViewCountService;
+    @Autowired
+    CrawlerBaseMapper crawlerBaseMapper;
 
     private final Map<String, RecallStrategy> strategyMap = new HashMap<>();
     private ApplicationContext applicationContext;
@@ -177,12 +187,29 @@ public class RecallService implements ApplicationContextAware {
     public void setTitleAvgViewCount(List<Content> contentList) {
         long start = System.currentTimeMillis();
 
-        List<String> titleList = contentList.stream().map(Content::getTitle).collect(Collectors.toList());
-        List<String> crawlerTitleList = contentList.stream().map(Content::getCrawlerTitle).collect(Collectors.toList());
+        Set<String> titleList = contentList.stream().map(Content::getTitle).collect(Collectors.toSet());
+        Set<String> crawlerTitleList = contentList.stream().map(Content::getCrawlerTitle).collect(Collectors.toSet());
         titleList.addAll(crawlerTitleList);
+        // 获取历史已发布文章
         List<Article> hisArticleList = articleRepository.getByTitleIn(titleList);
         Map<String, Map<Integer, List<Article>>> map = hisArticleList.stream()
                 .collect(Collectors.groupingBy(Article::getTitle, Collectors.groupingBy(Article::getItemIndex)));
+        Set<String> snList = hisArticleList.stream().map(Article::getWxSn).collect(Collectors.toSet());
+        List<ArticleDetailInfo> articleDetailInfoList = articleDetailInfoRepository.getAllByWxSnIn(snList);
+        Map<String, List<ArticleDetailInfo>> articleDetailInfoMap = articleDetailInfoList.stream()
+                .collect(Collectors.groupingBy(ArticleDetailInfo::getWxSn));
+        // 获取历史已发布文章所属头条内容
+        Set<String> ghIds = hisArticleList.stream().map(Article::getGhId).collect(Collectors.toSet());
+        Set<String> appMsgIds = hisArticleList.stream().map(Article::getAppMsgId).collect(Collectors.toSet());
+        List<Article> firstIndexHisArticleList = articleRepository.getByGhIdInAndAppMsgIdInAndItemIndex(ghIds, appMsgIds, 1);
+        Map<String, Map<String, Article>> firstIndexHisArticleMap = firstIndexHisArticleList.stream().collect(
+                Collectors.groupingBy(Article::getGhId, Collectors.toMap(Article::getAppMsgId, o -> o)));
+        // 获取发布账号 位置历史均值
+        List<AccountAvgInfo> accountAvgInfoList = accountAvgInfoRepository.getAllByGhIdIn(ghIds);
+        Map<String, Map<String, AccountAvgInfo>> accountAvgInfoIndexMap = accountAvgInfoList.stream().collect(
+                Collectors.groupingBy(AccountAvgInfo::getGhId, Collectors.toMap(AccountAvgInfo::getPosition, o -> o)));
+        Map<String, AccountAvgInfo> firstIndexAvgInfoMap = accountAvgInfoList.stream().filter(o -> "1".equals(o.getPosition()))
+                .collect(Collectors.toMap(AccountAvgInfo::getGhId, o -> o));
         for (Content content : contentList) {
             List<Article> hisArticles = new ArrayList<>();
             Map<Integer, List<Article>> indexArticleMap = map.get(content.getTitle());
@@ -212,15 +239,31 @@ public class RecallService implements ApplicationContextAware {
             for (Article hisArticle : hisArticles) {
                 ContentHisPublishArticle article = new ContentHisPublishArticle();
                 BeanUtils.copyProperties(hisArticle, article);
-                AvgReadDTO dto = accountIndexAvgViewCountService.getAvgReadDto(hisArticle.getGhId() + "_" + hisArticle.getItemIndex());
+                article.setViewCount(hisArticle.getShowViewCount());
+                article.setArticleDetailInfoList(articleDetailInfoMap.get(hisArticle.getWxSn()));
+                // 设置账号位置阅读均值
                 int avgViewCount = 0;
-                if (Objects.nonNull(dto)) {
+                Map<String, AccountAvgInfo> indexMap = accountAvgInfoIndexMap.get(hisArticle.getGhId());
+                if (Objects.nonNull(indexMap) && indexMap.containsKey(hisArticle.getItemIndex().toString())) {
                     article.setInnerAccount(true);
-                    avgViewCount = (int) dto.getReadAvg();
+                    avgViewCount = Optional.ofNullable(indexMap.get(hisArticle.getItemIndex().toString()).getReadAvg())
+                            .orElse(0.0).intValue();
                 }
                 article.setAvgViewCount(avgViewCount);
-                if (Objects.nonNull(article.getAvgViewCount()) && article.getAvgViewCount() > 0) {
-                    article.setViewCountRate((article.getShowViewCount() * 1.0) / article.getAvgViewCount());
+                if (Objects.nonNull(article.getAvgViewCount()) && article.getAvgViewCount() > 0
+                        && Objects.nonNull(article.getViewCount())) {
+                    article.setViewCountRate((article.getViewCount() * 1.0) / article.getAvgViewCount());
+                }
+                // 设置头条阅读均值
+                AccountAvgInfo firstIndexAvgInfo = firstIndexAvgInfoMap.get(hisArticle.getGhId());
+                Map<String, Article> firstIndexArticle = firstIndexHisArticleMap.get(hisArticle.getGhId());
+                if (Objects.nonNull(firstIndexArticle) && firstIndexArticle.containsKey(hisArticle.getAppMsgId())) {
+                    Article firstArticle = firstIndexArticle.get(hisArticle.getAppMsgId());
+                    article.setFirstViewCount(firstArticle.getShowViewCount());
+                    if (Objects.nonNull(firstIndexAvgInfo) && Objects.nonNull(firstIndexAvgInfo.getReadAvg())
+                            && firstIndexAvgInfo.getReadAvg() > 0 && Objects.nonNull(firstArticle.getShowViewCount())) {
+                        article.setFirstViewCountRate((firstArticle.getShowViewCount() * 1.0) / firstIndexAvgInfo.getReadAvg());
+                    }
                 }
                 content.getHisPublishArticleList().add(article);
             }

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

@@ -15,7 +15,7 @@ import lombok.Setter;
 public class Score {
     private String strategy;
     private String contentId;
-    private double score;
+    private Double score;
 
     public void setStrategy(ScoreStrategy strategy) {
         this.strategy = strategy.getClass().getSimpleName();

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/strategy/AccountPreDistributeStrategy.java

@@ -60,7 +60,7 @@ public class AccountPreDistributeStrategy implements ScoreStrategy {
             if (pools[2].equals(content.getContentPoolType())) {
                 if (articles.contains(content.getCrawlerChannelContentId())) {
                     score.setContentId(content.getId());
-                    score.setScore(weight);
+                    score.setScore(Double.valueOf(weight));
                 }
             }
             if (StringUtils.hasText(score.getContentId())) {

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/strategy/CategoryStrategy.java

@@ -52,7 +52,7 @@ public class CategoryStrategy implements ScoreStrategy {
                         List<AccountCategoryWeightConfig.CategoryWeight> categoryWeightList = categoryWeightConfig.getCategoryWeightList();
                         for (AccountCategoryWeightConfig.CategoryWeight categoryWeight : categoryWeightList) {
                             if (content.getCategory().contains(categoryWeight.getCategory())) {
-                                score.setScore(categoryWeight.getWeight());
+                                score.setScore(Double.valueOf(categoryWeight.getWeight()));
                             }
                         }
                     }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/strategy/FlowCtlDecreaseStrategy.java

@@ -57,7 +57,7 @@ public class FlowCtlDecreaseStrategy implements ScoreStrategy {
             score.setContentId(content.getId());
             Integer scoreVal = getContentScore(param.getAccountName(), hisPublishedContentMap, content);
             if (scoreVal != 0) {
-                score.setScore(scoreVal);
+                score.setScore(Double.valueOf(scoreVal));
                 scores.add(score);
             }
         }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/strategy/PublishTimesStrategy.java

@@ -68,6 +68,7 @@ public class PublishTimesStrategy implements ScoreStrategy {
             Score score = new Score();
             score.setStrategy(this);
             score.setContentId(content.getId());
+            score.setScore(0.0);
             for (int i = 0; i < contentPools.length; i++) {
                 int val = i + 1;
                 if (CollectionUtils.isEmpty(hisPublishedContentMap.get(content.getTitle()))

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/score/strategy/ViewCountRateStrategy.java

@@ -34,7 +34,6 @@ public class ViewCountRateStrategy implements ScoreStrategy {
                 }
                 double avgViewCountPos = accountIndexAvgViewCountService.getAvgReadCount(param.getGhId(), i + 1);
                 double avgViewCountFirst = accountIndexAvgViewCountService.getAvgReadCount(param.getGhId(), 1);
-                double avgViewCountSecond = accountIndexAvgViewCountService.getAvgReadCount(param.getGhId(), 2);
                 double showViewCountSum = 0D;
                 double avgViewCountSum = 0D;
                 double showViewCountSumFirst = 0D;
@@ -42,15 +41,17 @@ public class ViewCountRateStrategy implements ScoreStrategy {
                 double showViewCountSumSecond = 0D;
                 double avgViewCountSumSecond = 0D;
                 for (ContentHisPublishArticle hisItem : content.getHisPublishArticleList()) {
-                    if (hisItem.isInnerAccount() && hisItem.getShowViewCount() > 0 && hisItem.getAvgViewCount() > 0) {
+                    if (hisItem.isInnerAccount() && Objects.nonNull(hisItem.getViewCount())
+                            && hisItem.getViewCount() > 0 && Objects.nonNull(hisItem.getAvgViewCount())
+                            && hisItem.getAvgViewCount() > 0) {
                         if (hisItem.getItemIndex() == 1) {
-                            showViewCountSumFirst += hisItem.getShowViewCount();
+                            showViewCountSumFirst += hisItem.getViewCount();
                             avgViewCountSumFirst += hisItem.getAvgViewCount();
                         } else if (hisItem.getItemIndex() == 2) {
-                            showViewCountSumSecond += hisItem.getShowViewCount();
+                            showViewCountSumSecond += hisItem.getViewCount();
                             avgViewCountSumSecond += hisItem.getAvgViewCount();
                         } else {
-                            showViewCountSum += hisItem.getShowViewCount();
+                            showViewCountSum += hisItem.getViewCount();
                             avgViewCountSum += hisItem.getAvgViewCount();
                         }
                     }