Merge branch 'master' into wyp/0921-rankV12

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

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

@@ -50,7 +50,7 @@ public class AdplatformDBConfig {
                                                                                  @Qualifier("adplatformDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
-                .packages("com.tzld.longarticle.recommend.server.repository.entity.adplatform") // 实体类包路径
+                .packages("com.tzld.longarticle.recommend.server.model.entity.adplatform") // 实体类包路径
                 .persistenceUnit("adplatform")
                 .properties(hibernateProperties())
                 .build();

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

@@ -50,7 +50,7 @@ public class AigcDBConfig {
                                                                            @Qualifier("aigcDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
-                .packages("com.tzld.longarticle.recommend.server.repository.entity.aigc") // 实体类包路径
+                .packages("com.tzld.longarticle.recommend.server.model.entity.aigc") // 实体类包路径
                 .persistenceUnit("aigc")
                 .properties(hibernateProperties())
                 .build();

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

@@ -53,7 +53,7 @@ public class CrawlerDBConfig {
                                                                               @Qualifier("crawlerDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
-                .packages("com.tzld.longarticle.recommend.server.repository.entity.crawler") // 实体类包路径
+                .packages("com.tzld.longarticle.recommend.server.model.entity.crawler") // 实体类包路径
                 .persistenceUnit("crawler")
                 .properties(hibernateProperties())
                 .build();

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

@@ -50,7 +50,7 @@ public class LongArticleDBConfig {
                                                                            @Qualifier("longArticleDataSource") DataSource dataSource) {
         return builder
                 .dataSource(dataSource)
-                .packages("com.tzld.longarticle.recommend.server.repository.entity.longArticle") // 实体类包路径
+                .packages("com.tzld.longarticle.recommend.server.model.entity.longArticle") // 实体类包路径
                 .persistenceUnit("longarticle")
                 .properties(hibernateProperties())
                 .build();

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/mybatis/AdplatformMybatisConfig.java

@@ -12,7 +12,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import javax.sql.DataSource;
 
 @Configuration
-@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.repository.mapper.adplatform",
+@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.mapper.adplatform",
         sqlSessionFactoryRef = "adplatformSqlSessionFactory")
 public class AdplatformMybatisConfig {
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/mybatis/AigcMybatisConfig.java

@@ -12,7 +12,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import javax.sql.DataSource;
 
 @Configuration
-@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.repository.mapper.aigc",
+@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.mapper.aigc",
         sqlSessionFactoryRef = "aigcSqlSessionFactory")
 public class AigcMybatisConfig {
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/mybatis/CrawlerMybatisConfig.java

@@ -13,7 +13,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import javax.sql.DataSource;
 
 @Configuration
-@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.repository.mapper.crawler",
+@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.mapper.crawler",
         sqlSessionFactoryRef = "crawlerSqlSessionFactory")
 public class CrawlerMybatisConfig {
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/config/mybatis/LongArticleMybatisConfig.java

@@ -12,7 +12,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import javax.sql.DataSource;
 
 @Configuration
-@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.repository.mapper.longArticle",
+@MapperScan(basePackages = "com.tzld.longarticle.recommend.server.mapper.longArticle",
         sqlSessionFactoryRef = "longArticleSqlSessionFactory")
 public class LongArticleMybatisConfig {
 

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.adplatform;
+package com.tzld.longarticle.recommend.server.mapper.adplatform;
 
 import org.apache.ibatis.annotations.Mapper;
 

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

@@ -0,0 +1,23 @@
+package com.tzld.longarticle.recommend.server.mapper.aigc;
+
+import com.tzld.longarticle.recommend.server.model.entity.aigc.CrawlerPlan;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.CrawlerPlanResultRel;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishContent;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishPlanMiniprogramTask;
+import com.tzld.longarticle.recommend.server.model.param.MiniprogramTaskParam;
+import com.tzld.longarticle.recommend.server.model.param.PublishContentParam;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface AigcBaseMapper {
+
+    List<PublishContent> getPublishContentByTitle(List<PublishContentParam> list);
+
+    List<PublishPlanMiniprogramTask> getMiniProgramTask(List<MiniprogramTaskParam> miniprogramTaskParamList);
+
+    List<CrawlerPlanResultRel> getCrawlerPlanRelByChannelContentIds(List<String> channelContentIds);
+
+    List<CrawlerPlan> getCrawlerPlanByPlanIds(List<String> planIds);
+}

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.crawler;
+package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.AlgGhAutoreplyVideoRankData;
 import com.tzld.longarticle.recommend.server.repository.model.AlgGhAutoreplyVideoRankDataExample;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.crawler;
+package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLink;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLinkExample;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.crawler;
+package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.ArticleGzhDeveloper;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleGzhDeveloperExample;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.crawler;
+package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.ArticleUserGroup;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleUserGroupExample;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.crawler;
+package com.tzld.longarticle.recommend.server.mapper.crawler;
 
 import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketData;
 import com.tzld.longarticle.recommend.server.repository.model.CgiReplyBucketDataExample;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/crawler/CrawlerBaseMapper.java

@@ -0,0 +1,11 @@
+package com.tzld.longarticle.recommend.server.mapper.crawler;
+
+import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountCorrelation;
+
+import java.util.List;
+
+public interface CrawlerBaseMapper {
+
+    void batchInsertAccountCorrelation(List<AccountCorrelation> list);
+
+}

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/mapper/longArticle/LongArticleBaseMapper.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/mapper/longArticle/LongArticleBaseMapper.java

@@ -1,6 +1,6 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.longArticle;
+package com.tzld.longarticle.recommend.server.mapper.longArticle;
 
-import com.tzld.longarticle.recommend.server.repository.entity.longArticle.DatastatSortStrategy;
+import com.tzld.longarticle.recommend.server.model.entity.longArticle.DatastatSortStrategy;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/Content.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/dto/Content.java

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

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

@@ -1,6 +1,6 @@
-package com.tzld.longarticle.recommend.server.model;
+package com.tzld.longarticle.recommend.server.model.dto;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleDetailInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleDetailInfo;
 import lombok.Getter;
 import lombok.Setter;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/adplatform/ChangwenArticle.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/adplatform/ChangwenArticle.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.adplatform;
+package com.tzld.longarticle.recommend.server.model.entity.adplatform;
 
 import lombok.Data;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/adplatform/ChangwenArticleDatastat.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/adplatform/ChangwenArticleDatastat.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.adplatform;
+package com.tzld.longarticle.recommend.server.model.entity.adplatform;
 
 import lombok.Data;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/CrawlerMetaArticle.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerMetaArticle.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/CrawlerPlan.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerPlan.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/CrawlerPlanResultRel.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/CrawlerPlanResultRel.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/ProducePlan.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlan.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/ProducePlanExeRecord.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlanExeRecord.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/ProducePlanInputSource.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/ProducePlanInputSource.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/PublishAccount.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishAccount.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 
 import lombok.AllArgsConstructor;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/PublishContent.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishContent.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/PublishContentLayout.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishContentLayout.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/PublishPlan.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishPlan.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/entity/aigc/PublishPlanMiniprogramTask.java → long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/aigc/PublishPlanMiniprogramTask.java

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.aigc;
+package com.tzld.longarticle.recommend.server.model.entity.aigc;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.crawler;
+package com.tzld.longarticle.recommend.server.model.entity.crawler;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.repository.entity.longArticle;
+package com.tzld.longarticle.recommend.server.model.entity.longArticle;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.service;
+package com.tzld.longarticle.recommend.server.model.param;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.model;
+package com.tzld.longarticle.recommend.server.model.param;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.model;
+package com.tzld.longarticle.recommend.server.model.vo;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

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

@@ -1,9 +1,6 @@
-package com.tzld.longarticle.recommend.server.model;
+package com.tzld.longarticle.recommend.server.model.vo;
 
 import lombok.Data;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.tzld.longarticle.recommend.server.model;
+package com.tzld.longarticle.recommend.server.model.vo;
 
 import lombok.*;
 

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

@@ -3,7 +3,7 @@ package com.tzld.longarticle.recommend.server.remote;
 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.Content;
+import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.service.recall.RecallParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/remote/ArticleListRemoteService.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.repository.crawler.ArticleRepository;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.HttpEntity;

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

@@ -8,7 +8,7 @@ import com.tencentcloudapi.tms.v20201229.TmsClient;
 import com.tencentcloudapi.tms.v20201229.models.TextModerationRequest;
 import com.tencentcloudapi.tms.v20201229.models.TextModerationResponse;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleSensitiveRepository;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleSensitive;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleSensitive;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -2,7 +2,7 @@ package com.tzld.longarticle.recommend.server.remote;
 
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
-import com.tzld.longarticle.recommend.server.model.Content;
+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;
 import lombok.extern.slf4j.Slf4j;

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

@@ -2,7 +2,6 @@ package com.tzld.longarticle.recommend.server.remote;
 
 import com.alibaba.fastjson.JSONObject;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
-import com.tzld.longarticle.recommend.server.model.Content;
 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/WxUserManagementRemoteService.java

@@ -3,7 +3,7 @@ package com.tzld.longarticle.recommend.server.remote;
 import com.aliyun.odps.utils.StringUtils;
 import com.google.common.reflect.TypeToken;
 import com.tzld.longarticle.recommend.server.common.HttpPoolFactory;
-import com.tzld.longarticle.recommend.server.model.WxUserGetResponse;
+import com.tzld.longarticle.recommend.server.model.vo.WxUserGetResponse;
 import com.tzld.longarticle.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpEntity;

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.adplatform;
 
-import com.tzld.longarticle.recommend.server.repository.entity.adplatform.ChangwenArticleDatastat;
+import com.tzld.longarticle.recommend.server.model.entity.adplatform.ChangwenArticleDatastat;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.adplatform;
 
-import com.tzld.longarticle.recommend.server.repository.entity.adplatform.ChangwenArticle;
+import com.tzld.longarticle.recommend.server.model.entity.adplatform.ChangwenArticle;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.CrawlerMetaArticle;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.CrawlerMetaArticle;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.ProducePlanExeRecord;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.ProducePlanExeRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.ProducePlanInputSource;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.ProducePlanInputSource;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.ProducePlan;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.ProducePlan;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.PublishAccount;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.PublishContentLayout;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishContentLayout;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.PublishContent;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishContent;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.aigc;
 
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.PublishPlan;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishPlan;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.AccountAvgInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.AccountCorrelation;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountCorrelation;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleDetailInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleDetailInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticlePreDistributeAccount;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticlePreDistributeAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleSensitive;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleSensitive;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.PublishContentSortLog;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishContentSortLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.crawler;
 
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.PublishSortLog;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/longArticle/DatastatSortStrategyRepository.java

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.repository.longArticle;
 
-import com.tzld.longarticle.recommend.server.repository.entity.longArticle.DatastatSortStrategy;
+import com.tzld.longarticle.recommend.server.model.entity.longArticle.DatastatSortStrategy;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

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

@@ -1,20 +0,0 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.aigc;
-
-import com.tzld.longarticle.recommend.server.model.MiniprogramTaskParam;
-import com.tzld.longarticle.recommend.server.model.PublishContentParam;
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.*;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface AigcBaseMapper {
-
-    List<PublishContent> getPublishContentByTitle(List<PublishContentParam> list);
-
-    List<PublishPlanMiniprogramTask> getMiniProgramTask(List<MiniprogramTaskParam> miniprogramTaskParamList);
-
-    List<CrawlerPlanResultRel> getCrawlerPlanRelByChannelContentIds(List<String> channelContentIds);
-
-    List<CrawlerPlan> getCrawlerPlanByPlanIds(List<String> planIds);
-}

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

@@ -1,11 +0,0 @@
-package com.tzld.longarticle.recommend.server.repository.mapper.crawler;
-
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.AccountCorrelation;
-
-import java.util.List;
-
-public interface CrawlerBaseMapper {
-
-    void batchInsertAccountCorrelation(List<AccountCorrelation> list);
-
-}

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

@@ -3,7 +3,7 @@ package com.tzld.longarticle.recommend.server.service;
 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.repository.entity.crawler.AccountAvgInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.service.score.AvgReadDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;

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

@@ -7,20 +7,24 @@ 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.model.*;
+import com.tzld.longarticle.recommend.server.model.entity.aigc.*;
+import com.tzld.longarticle.recommend.server.model.param.MiniprogramTaskParam;
+import com.tzld.longarticle.recommend.server.model.param.PublishContentParam;
+import com.tzld.longarticle.recommend.server.model.vo.IntermediateIndicatorsExport;
+import com.tzld.longarticle.recommend.server.model.vo.NewSortStrategyExport;
+import com.tzld.longarticle.recommend.server.model.vo.ProduceAuditLayoutContentObjVO;
 import com.tzld.longarticle.recommend.server.repository.aigc.*;
 import com.tzld.longarticle.recommend.server.repository.crawler.AccountAvgInfoRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleDetailInfoRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.ArticleRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.PublishSortLogRepository;
-import com.tzld.longarticle.recommend.server.repository.entity.aigc.*;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.AccountAvgInfo;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.ArticleDetailInfo;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.PublishSortLog;
-import com.tzld.longarticle.recommend.server.repository.entity.longArticle.DatastatSortStrategy;
-import com.tzld.longarticle.recommend.server.repository.mapper.aigc.AigcBaseMapper;
-import com.tzld.longarticle.recommend.server.repository.mapper.longArticle.LongArticleBaseMapper;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.ArticleDetailInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
+import com.tzld.longarticle.recommend.server.model.entity.longArticle.DatastatSortStrategy;
+import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
+import com.tzld.longarticle.recommend.server.mapper.longArticle.LongArticleBaseMapper;
 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/JobService.java

@@ -1,11 +1,9 @@
 package com.tzld.longarticle.recommend.server.service;
 
-import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
 import com.tzld.longarticle.recommend.server.remote.WxFetchRemoteService;
-import com.tzld.longarticle.recommend.server.repository.mapper.crawler.ArticleContentLinkMapper;
+import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleContentLinkMapper;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLink;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLinkExample;
-import com.tzld.longarticle.recommend.server.util.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,7 +1,7 @@
 package com.tzld.longarticle.recommend.server.service;
 
-import com.tzld.longarticle.recommend.server.repository.mapper.crawler.ArticleContentLinkMapper;
-import com.tzld.longarticle.recommend.server.repository.mapper.crawler.ArticleGzhDeveloperMapper;
+import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleContentLinkMapper;
+import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleGzhDeveloperMapper;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleContentLink;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleGzhDeveloper;
 import lombok.extern.slf4j.Slf4j;

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

@@ -2,14 +2,20 @@ package com.tzld.longarticle.recommend.server.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.tzld.longarticle.recommend.server.model.*;
+import com.tzld.longarticle.recommend.server.model.dto.Content;
+import com.tzld.longarticle.recommend.server.model.param.RecommendParam;
+import com.tzld.longarticle.recommend.server.model.param.RecommendRequest;
+import com.tzld.longarticle.recommend.server.model.vo.ArticleSortResponseData;
+import com.tzld.longarticle.recommend.server.model.vo.ArticleSortResponseDataItem;
+import com.tzld.longarticle.recommend.server.model.vo.RecommendResponse;
+import com.tzld.longarticle.recommend.server.model.vo.RecommendWithUserGroupResponse;
 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.repository.entity.crawler.AccountAvgInfo;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.PublishContentSortLog;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.PublishSortLog;
-import com.tzld.longarticle.recommend.server.repository.mapper.crawler.ArticleUserGroupMapper;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishContentSortLog;
+import com.tzld.longarticle.recommend.server.model.entity.crawler.PublishSortLog;
+import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleUserGroupMapper;
 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;

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

@@ -1,9 +1,9 @@
 package com.tzld.longarticle.recommend.server.service;
 
-import com.tzld.longarticle.recommend.server.model.WxUserGetResponse;
+import com.tzld.longarticle.recommend.server.model.vo.WxUserGetResponse;
 import com.tzld.longarticle.recommend.server.remote.WxUserManagementRemoteService;
-import com.tzld.longarticle.recommend.server.repository.mapper.crawler.ArticleGzhDeveloperMapper;
-import com.tzld.longarticle.recommend.server.repository.mapper.crawler.ArticleUserGroupMapper;
+import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleGzhDeveloperMapper;
+import com.tzld.longarticle.recommend.server.mapper.crawler.ArticleUserGroupMapper;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleGzhDeveloper;
 import com.tzld.longarticle.recommend.server.repository.model.ArticleUserGroup;
 import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;

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

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

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

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

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

@@ -1,7 +1,7 @@
 package com.tzld.longarticle.recommend.server.service.filter;
 
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.model.Content;
+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.util.CommonCollectionUtils;

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

@@ -1,7 +1,7 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.tzld.longarticle.recommend.server.model.Content;
+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;

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

@@ -1,6 +1,6 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
-import com.tzld.longarticle.recommend.server.model.Content;
+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;

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

@@ -2,7 +2,7 @@ package com.tzld.longarticle.recommend.server.service.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.model.Content;
+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;

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

@@ -1,8 +1,8 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
-import com.tzld.longarticle.recommend.server.model.Content;
+import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
+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;

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

@@ -1,9 +1,9 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.model.Content;
+import com.tzld.longarticle.recommend.server.model.dto.Content;
 import com.tzld.longarticle.recommend.server.remote.ArticleListRemoteService;
-import com.tzld.longarticle.recommend.server.repository.entity.crawler.Article;
+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;

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

@@ -1,7 +1,7 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
-import com.tzld.longarticle.recommend.server.model.Content;
+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;

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

@@ -1,7 +1,7 @@
 package com.tzld.longarticle.recommend.server.service.filter.strategy;
 
-import com.tzld.longarticle.recommend.server.model.Content;
-import com.tzld.longarticle.recommend.server.model.ContentHisPublishArticle;
+import com.tzld.longarticle.recommend.server.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;

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

@@ -3,10 +3,10 @@ package com.tzld.longarticle.recommend.server.service.filter.strategy;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.common.ThreadPoolFactory;
-import com.tzld.longarticle.recommend.server.model.Content;
+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.repository.entity.crawler.ArticleSensitive;
+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;

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

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

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

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

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

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