file move

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/SceneConstants.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/constant/SceneConstants.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.common.constant;
 
 /**
  * @author dyp

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/AccountBusinessTypeEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/AccountBusinessTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 import lombok.Getter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/ArticleTypeEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/ArticleTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 import lombok.Getter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/ContentPoolEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/ContentPoolEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 import lombok.Getter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/FeishuRobotIdEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/FeishuRobotIdEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 import lombok.Getter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/PushTypeEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/PushTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 import lombok.Getter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/RankStrategyEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/RankStrategyEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 import lombok.Getter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/ScoreStrategyEnum.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/common/enums/recommend/ScoreStrategyEnum.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.common.enums;
+package com.tzld.longarticle.recommend.server.common.enums.recommend;
 
 public enum ScoreStrategyEnum {
     ACCOUNT_PRE_DISTRIBUTE("AccountPreDistributeStrategy"),

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.model.param;
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.recall.RecallParam;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;
 import org.apache.http.StatusLine;

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

@@ -3,7 +3,7 @@ package com.tzld.longarticle.recommend.server.remote;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
-import com.tzld.longarticle.recommend.server.common.enums.FeishuRobotIdEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotIdEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.util.MapBuilder;
 import com.tzld.longarticle.recommend.server.util.feishu.FeishuMessageSender;

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

@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.tzld.longarticle.recommend.server.common.enums.AccountBusinessTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.FeishuRobotIdEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.AccountBusinessTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotIdEnum;
 import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.crawler.CrawlerBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.crawler.PushMessageCallbackMapper;
@@ -25,7 +25,6 @@ import com.tzld.longarticle.recommend.server.repository.crawler.LongArticlesVide
 import com.tzld.longarticle.recommend.server.repository.longArticle.GetOffVideoArticleRepository;
 import com.tzld.longarticle.recommend.server.repository.longArticle.LongArticlesMatchVideoRepository;
 import com.tzld.longarticle.recommend.server.repository.longArticle.LongArticlesReadRateRepository;
-import com.tzld.longarticle.recommend.server.repository.model.PushMessageCallback;
 import com.tzld.longarticle.recommend.server.repository.model.PushMessageCallbackExample;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import com.tzld.longarticle.recommend.server.util.LarkRobotUtil;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.service.recommend;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
@@ -6,8 +6,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.collect.Lists;
-import com.tzld.longarticle.recommend.server.common.enums.AccountBusinessTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.AccountBusinessTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.longArticle.LongArticleBaseMapper;
 import com.tzld.longarticle.recommend.server.model.dto.ProduceContentDTO;
@@ -28,7 +28,7 @@ import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRe
 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.crawler.PublishSortLogRepository;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import com.tzld.longarticle.recommend.server.util.MapBuilder;
 import com.tzld.longarticle.recommend.server.util.feishu.FeiShu;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.service.recommend;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.PushTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.PushTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
 import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleUserGroupMapper;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
@@ -20,12 +20,14 @@ import com.tzld.longarticle.recommend.server.model.vo.RecommendWithUserGroupResp
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.PublishContentSortLogRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankService;
-import com.tzld.longarticle.recommend.server.service.recall.RecallParam;
-import com.tzld.longarticle.recommend.server.service.recall.RecallResult;
-import com.tzld.longarticle.recommend.server.service.recall.RecallService;
+import com.tzld.longarticle.recommend.server.common.constant.SceneConstants;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankService;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallParam;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallResult;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
@@ -44,7 +46,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.tzld.longarticle.recommend.server.service.SceneConstants.FWH_COLD_START;
+import static com.tzld.longarticle.recommend.server.common.constant.SceneConstants.FWH_COLD_START;
 
 /**
  * @author dyp

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/AccountContentPoolConfigService.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/config/AccountContentPoolConfigService.java

@@ -1,11 +1,11 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.service.recommend.config;
 
 import com.ctrip.framework.apollo.model.ConfigChangeEvent;
 import com.ctrip.framework.apollo.spring.annotation.ApolloConfigChangeListener;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/AccountIndexAvgViewCountService.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/config/AccountIndexAvgViewCountService.java

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.service.recommend.config;
 
 import cn.hutool.core.io.resource.ResourceUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
-import com.tzld.longarticle.recommend.server.service.score.AvgReadDTO;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AvgReadDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/StrategyIndexScoreWeightService.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/config/StrategyIndexScoreWeightService.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.service.recommend.config;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import lombok.extern.slf4j.Slf4j;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/FilterParam.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/FilterParam.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.filter;
+package com.tzld.longarticle.recommend.server.service.recommend.filter;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/FilterResult.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/FilterResult.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.filter;
+package com.tzld.longarticle.recommend.server.service.recommend.filter;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.AllArgsConstructor;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/FilterService.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/FilterService.java

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.filter;
+package com.tzld.longarticle.recommend.server.service.recommend.filter;
 
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.service.ServiceBeanFactory;
-import com.tzld.longarticle.recommend.server.service.filter.strategy.*;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.strategy.*;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +18,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import static com.tzld.longarticle.recommend.server.service.SceneConstants.FWH_COLD_START;
+import static com.tzld.longarticle.recommend.server.common.constant.SceneConstants.FWH_COLD_START;
 
 @Slf4j
 @Service

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/filter/FilterStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/filter/FilterStrategy.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.filter;
+package com.tzld.longarticle.recommend.server.service.recommend.filter;
 
 
 public interface FilterStrategy {

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

@@ -1,11 +1,11 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.remote.AIGCRemoteService;
-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.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import com.tzld.longarticle.recommend.server.util.TitleSimilarCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-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;
-import com.tzld.longarticle.recommend.server.service.filter.FilterStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,11 +1,11 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.common.enums.ContentPoolEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ContentPoolEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-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.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;

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

@@ -1,12 +1,12 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
-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.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import com.tzld.longarticle.recommend.server.util.TitleSimilarCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
 import com.tzld.longarticle.recommend.server.model.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;
-import com.tzld.longarticle.recommend.server.service.filter.FilterStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import com.tzld.longarticle.recommend.server.util.TitleSimilarCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

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

@@ -1,13 +1,13 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
-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.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import com.tzld.longarticle.recommend.server.util.TitleSimilarCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-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.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;

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

@@ -1,12 +1,12 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.dto.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.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.filter.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.filter.strategy;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
@@ -7,9 +7,9 @@ import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.remote.ArticleSensitiveRemoteService;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleSensitiveRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleSensitive;
-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.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
 import com.tzld.longarticle.recommend.server.util.Md5Util;
 import com.tzld.longarticle.recommend.server.util.TitleSimilarCheckUtil;
 import lombok.extern.slf4j.Slf4j;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankItem.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankItem.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.rank;
+package com.tzld.longarticle.recommend.server.service.recommend.rank;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankParam.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankParam.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.rank;
+package com.tzld.longarticle.recommend.server.service.recommend.rank;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankResult.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankResult.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.rank;
+package com.tzld.longarticle.recommend.server.service.recommend.rank;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.AllArgsConstructor;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankService.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankService.java

@@ -1,18 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank;
+package com.tzld.longarticle.recommend.server.service.recommend.rank;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.service.ServiceBeanFactory;
-import com.tzld.longarticle.recommend.server.service.rank.strategy.FwhColdStartRankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.strategy.FwhColdStartRankStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import static com.tzld.longarticle.recommend.server.service.SceneConstants.FWH_COLD_START;
+import static com.tzld.longarticle.recommend.server.common.constant.SceneConstants.FWH_COLD_START;
 
 /**
  * @author dyp

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/RankStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/RankStrategy.java

@@ -1,12 +1,12 @@
-package com.tzld.longarticle.recommend.server.service.rank;
+package com.tzld.longarticle.recommend.server.service.recommend.rank;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ContentPoolEnum;
-import com.tzld.longarticle.recommend.server.common.enums.FeishuRobotIdEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ContentPoolEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotIdEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
 import com.tzld.longarticle.recommend.server.util.TitleSimilarCheckUtil;
 import com.tzld.longarticle.recommend.server.util.feishu.FeishuMessageSender;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/DefaultRankStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/DefaultRankStrategy.java

@@ -1,17 +1,17 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/FwhColdStartRankStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/FwhColdStartRankStrategy.java

@@ -1,15 +1,15 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/InfiniteRankStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/InfiniteRankStrategy.java

@@ -1,15 +1,15 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/LateRankStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/LateRankStrategy.java

@@ -1,15 +1,15 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV10Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV10Strategy.java

@@ -1,19 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV11Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV11Strategy.java

@@ -1,18 +1,17 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.StrategyIndexScoreWeightService;
-import com.tzld.longarticle.recommend.server.service.rank.*;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.StrategyIndexScoreWeightService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.*;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV12Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV12Strategy.java

@@ -1,18 +1,17 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.StrategyIndexScoreWeightService;
-import com.tzld.longarticle.recommend.server.service.rank.*;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.StrategyIndexScoreWeightService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.*;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV13Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV13Strategy.java

@@ -1,18 +1,17 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.StrategyIndexScoreWeightService;
-import com.tzld.longarticle.recommend.server.service.rank.*;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.StrategyIndexScoreWeightService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.*;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV14Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV14Strategy.java

@@ -1,18 +1,17 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.StrategyIndexScoreWeightService;
-import com.tzld.longarticle.recommend.server.service.rank.*;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.StrategyIndexScoreWeightService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.*;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV2Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV2Strategy.java

@@ -1,14 +1,14 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV3Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV3Strategy.java

@@ -1,19 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV4Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV4Strategy.java

@@ -1,19 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV5Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV5Strategy.java

@@ -1,17 +1,17 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.StrategyIndexScoreWeightService;
-import com.tzld.longarticle.recommend.server.service.rank.*;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.StrategyIndexScoreWeightService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.*;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV7Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV7Strategy.java

@@ -1,19 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV8Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV8Strategy.java

@@ -1,19 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV9Strategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/rank/strategy/RankV9Strategy.java

@@ -1,19 +1,18 @@
-package com.tzld.longarticle.recommend.server.service.rank.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.rank.strategy;
 
 
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.rank.RankItem;
-import com.tzld.longarticle.recommend.server.service.rank.RankParam;
-import com.tzld.longarticle.recommend.server.service.rank.RankResult;
-import com.tzld.longarticle.recommend.server.service.rank.RankStrategy;
-import com.tzld.longarticle.recommend.server.service.score.AccountIndexReplacePoolConfig;
-import com.tzld.longarticle.recommend.server.service.score.ScoreResult;
-import com.tzld.longarticle.recommend.server.service.score.ScoreService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
+import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountIndexReplacePoolConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.recall;
+package com.tzld.longarticle.recommend.server.service.recommend.recall;
 
 import lombok.Data;
 

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

@@ -1,7 +1,7 @@
-package com.tzld.longarticle.recommend.server.service.recall;
+package com.tzld.longarticle.recommend.server.service.recommend.recall;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.recall;
+package com.tzld.longarticle.recommend.server.service.recommend.recall;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.recall;
+package com.tzld.longarticle.recommend.server.service.recommend.recall;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.AllArgsConstructor;

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

@@ -1,9 +1,9 @@
-package com.tzld.longarticle.recommend.server.service.recall;
+package com.tzld.longarticle.recommend.server.service.recommend.recall;
 
 import com.google.common.collect.Lists;
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
-import com.tzld.longarticle.recommend.server.common.enums.FeishuRobotIdEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotIdEnum;
 import com.tzld.longarticle.recommend.server.mapper.crawler.CrawlerBaseMapper;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.dto.ContentHisPublishArticle;
@@ -18,9 +18,9 @@ import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRe
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountCorrelationRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleDetailInfoRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
-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.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.strategy.DefaultRecallStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.recall;
+package com.tzld.longarticle.recommend.server.service.recommend.recall;
 
 /**
  * @author dyp

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recall/strategy/ColdStartBackupRecallStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/recall/strategy/ColdStartBackupRecallStrategy.java

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.recall.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.recall.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-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.FilterService;
-import com.tzld.longarticle.recommend.server.service.recall.*;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterService;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recall/strategy/DefaultRecallStrategy.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/recall/strategy/DefaultRecallStrategy.java

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.recall.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.recall.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-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.FilterService;
-import com.tzld.longarticle.recommend.server.service.recall.*;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterService;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import lombok.AllArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.common.enums.RankStrategyEnum;
-import com.tzld.longarticle.recommend.server.common.enums.ScoreStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.RankStrategyEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ScoreStrategyEnum;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score;
+package com.tzld.longarticle.recommend.server.service.recommend.score;
 
 
 import com.tzld.longarticle.recommend.server.util.DateUtils;

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

@@ -1,14 +1,14 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.google.common.reflect.TypeToken;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticlePreDistributeAccountRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticlePreDistributeAccount;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,13 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.repository.aigc.CrawlerMetaArticleRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.score.AccountCategoryWeightConfig;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountCategoryWeightConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

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

@@ -1,9 +1,9 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.NormalizationUtils;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
@@ -6,10 +6,10 @@ import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.dto.ContentHisPublishArticle;
 import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,10 +1,10 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
@@ -6,11 +6,11 @@ import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.repository.aigc.CrawlerMetaArticleRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.score.AccountPublishTimesConfig;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.AccountPublishTimesConfig;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,9 +1,9 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.remote.NLPRemoteService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,14 +1,14 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.dto.ContentHisPublishArticle;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.MathUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,14 +1,14 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.model.dto.ContentHisPublishArticle;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
-import com.tzld.longarticle.recommend.server.service.AccountContentPoolConfigService;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountContentPoolConfigService;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.MathUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,8 +1,8 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.NormalizationUtils;
 import lombok.extern.slf4j.Slf4j;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service.score.strategy;
+package com.tzld.longarticle.recommend.server.service.recommend.score.strategy;
 
 import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.repository.adplatform.ChangwenArticleDatastatRepository;
@@ -7,10 +7,10 @@ import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRe
 import com.tzld.longarticle.recommend.server.model.entity.adplatform.ChangwenArticle;
 import com.tzld.longarticle.recommend.server.model.entity.adplatform.ChangwenArticleDatastat;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
-import com.tzld.longarticle.recommend.server.service.AccountIndexAvgViewCountService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.ScoreStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.config.AccountIndexAvgViewCountService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreStrategy;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
 import com.tzld.longarticle.recommend.server.util.NormalizationUtils;
 import lombok.extern.slf4j.Slf4j;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/DataDashboardController.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/DataDashboardController.java

@@ -1,6 +1,6 @@
-package com.tzld.longarticle.recommend.server.web;
+package com.tzld.longarticle.recommend.server.web.recommend;
 
-import com.tzld.longarticle.recommend.server.service.DataDashboardService;
+import com.tzld.longarticle.recommend.server.service.recommend.DataDashboardService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/JobController.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/JobController.java

@@ -1,18 +1,11 @@
-package com.tzld.longarticle.recommend.server.web;
+package com.tzld.longarticle.recommend.server.web.recommend;
 
-import com.tzld.longarticle.recommend.server.model.Result;
 import com.tzld.longarticle.recommend.server.service.JobService;
-import com.tzld.longarticle.recommend.server.service.UserManagementService;
-import com.tzld.longarticle.recommend.server.service.WXListenService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @author dyp
  */

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/RecommendController.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/RecommendController.java

@@ -1,9 +1,9 @@
-package com.tzld.longarticle.recommend.server.web;
+package com.tzld.longarticle.recommend.server.web.recommend;
 
 import com.tzld.longarticle.recommend.server.model.param.RecommendRequest;
 import com.tzld.longarticle.recommend.server.model.vo.RecommendResponse;
 import com.tzld.longarticle.recommend.server.model.vo.RecommendWithUserGroupResponse;
-import com.tzld.longarticle.recommend.server.service.RecommendService;
+import com.tzld.longarticle.recommend.server.service.recommend.RecommendService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/DataDashboardTest.java

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server;
 
-import com.tzld.longarticle.recommend.server.service.DataDashboardService;
+import com.tzld.longarticle.recommend.server.service.recommend.DataDashboardService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/FilterStrategyTest.java

@@ -8,10 +8,10 @@ import com.tzld.longarticle.recommend.server.remote.AIGCRemoteService;
 import com.tzld.longarticle.recommend.server.remote.ArticleSensitiveRemoteService;
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
-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.recall.RecallParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterParam;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterResult;
+import com.tzld.longarticle.recommend.server.service.recommend.filter.FilterStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallParam;
 import com.tzld.longarticle.recommend.server.util.Md5Util;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/RecommendTest.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.mapper.crawler.CrawlerBaseMapper;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
@@ -14,8 +14,8 @@ import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRe
 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.crawler.PublishSortLogRepository;
-import com.tzld.longarticle.recommend.server.service.RecommendService;
-import com.tzld.longarticle.recommend.server.service.recall.RecallService;
+import com.tzld.longarticle.recommend.server.service.recommend.RecommendService;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallService;
 import com.tzld.longarticle.recommend.server.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Cell;
@@ -24,6 +24,7 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.BeanUtils;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
@@ -524,4 +525,28 @@ public class RecommendTest {
         }
     }
 
+    @Test
+    public void account() {
+        List<String> ghIds = Arrays.asList("gh_d7fa1998b4e1","gh_52100b6803fb","gh_8d7fc54d5026");
+        List<String> accountNames = Arrays.asList("生活超读","灵读生活","生活情感读");
+        List<Integer> fans = Arrays.asList(85759,103083,79214);
+        List<Article> articleList = articleRepository.getByGhIdInAndUpdateTimeLessThanAndTypeEquals(
+                Arrays.asList("gh_02f5bca5b5d9"), 1729353600L, ArticleTypeEnum.QUNFA.getVal());
+        for (int i = 0; i < ghIds.size(); i++) {
+            String ghId = ghIds.get(i);
+            String accountName = accountNames.get(i);
+            Integer fanCount = fans.get(i);
+            Double rate = fanCount / 233474.0;
+            for (Article article : articleList) {
+                Article saveItem = new Article();
+                BeanUtils.copyProperties(article, saveItem);
+                saveItem.setGhId(ghId);
+                saveItem.setAccountName(accountName);
+                saveItem.setShowViewCount((int) (article.getShowViewCount() * rate));
+                saveItem.setWxSn(UUID.randomUUID().toString().replace("-", ""));
+                articleRepository.save(saveItem);
+            }
+        }
+    }
+
 }

long-article-recommend-service/src/test/java/com/tzld/longarticle/recommend/server/ScoreStrategyTest.java

@@ -1,13 +1,13 @@
 package com.tzld.longarticle.recommend.server;
 
 import com.alibaba.fastjson.JSONObject;
-import com.tzld.longarticle.recommend.server.common.enums.ArticleTypeEnum;
+import com.tzld.longarticle.recommend.server.common.enums.recommend.ArticleTypeEnum;
 import com.tzld.longarticle.recommend.server.model.dto.Content;
-import com.tzld.longarticle.recommend.server.service.recall.RecallService;
-import com.tzld.longarticle.recommend.server.service.score.Score;
-import com.tzld.longarticle.recommend.server.service.score.ScoreParam;
-import com.tzld.longarticle.recommend.server.service.score.strategy.ViewCountRateStrategy;
-import com.tzld.longarticle.recommend.server.service.score.strategy.ViewMultiplierStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.recall.RecallService;
+import com.tzld.longarticle.recommend.server.service.recommend.score.Score;
+import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
+import com.tzld.longarticle.recommend.server.service.recommend.score.strategy.ViewCountRateStrategy;
+import com.tzld.longarticle.recommend.server.service.recommend.score.strategy.ViewMultiplierStrategy;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;