Merge branch 'wyp/1126-longArticleIdDB' of Server/long-article-recommend into master

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

@@ -3,7 +3,6 @@ package com.tzld.longarticle.recommend.server.mapper.crawler;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountCorrelation;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.Article;
-import com.tzld.longarticle.recommend.server.model.entity.crawler.LongArticlesRootSourceId;
 
 import java.util.List;
 
@@ -11,8 +10,6 @@ public interface CrawlerBaseMapper {
 
     void batchInsertAccountCorrelation(List<AccountCorrelation> list);
 
-    void batchInsertLongArticlesRootSourceId(List<LongArticlesRootSourceId> list);
-
     void batchInsertAccountAvgInfo(List<AccountAvgInfo> list);
 
     void deleteAccountAvgInfoByGhIdAndUpdateTime(String ghId, String date);

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

@@ -1,5 +1,6 @@
 package com.tzld.longarticle.recommend.server.mapper.longArticle;
 
+import com.tzld.longarticle.recommend.server.model.entity.longArticle.LongArticlesRootSourceId;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.ArticleCategory;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.DatastatScore;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.ArticlePoolPromotionSource;
@@ -29,4 +30,6 @@ public interface LongArticleBaseMapper {
 
     List<DatastatSortStrategy> getArticlePromotion(Integer viewCount, Double viewCountRate,
                                                    Integer fans, String dateStr, List<Integer> positions);
+
+    void batchInsertLongArticlesRootSourceId(List<LongArticlesRootSourceId> list);
 }

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

@@ -1,76 +0,0 @@
-package com.tzld.longarticle.recommend.server.model.entity.crawler;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Entity
-@Table(name = "long_articles_root_source_id")
-public class LongArticlesRootSourceId {
-
-    /**
-     * rootSourceId
-     */
-    @Id
-    @Column(name = "rootSourceId", nullable = false, unique = true, length = 128,
-            columnDefinition = "varchar(128) NOT NULL COMMENT 'rootSourceId'")
-    private String rootSourceId;
-
-    /**
-     * 账号名字
-     */
-    @Column(name = "accountName", length = 128,
-            columnDefinition = "varchar(128) DEFAULT NULL COMMENT '账号名字'")
-    private String accountName;
-
-    /**
-     * ghid
-     */
-    @Column(name = "ghId", length = 16,
-            columnDefinition = "varchar(16) DEFAULT NULL COMMENT 'ghid'")
-    private String ghId;
-
-    /**
-     * 文章标题
-     */
-    @Column(name = "articleTitle", length = 255,
-            columnDefinition = "varchar(255) DEFAULT NULL COMMENT '文章标题'")
-    private String articleTitle;
-
-    /**
-     * 请求时间
-     */
-    @Column(name = "requestTime",
-            columnDefinition = "int(16) DEFAULT NULL COMMENT '请求时间'")
-    private Long requestTime;
-
-    /**
-     * 请求trace_id
-     */
-    @Column(name = "trace_id", length = 255,
-            columnDefinition = "varchar(255) DEFAULT NULL COMMENT '请求trace_id'")
-    private String traceId;
-
-    /**
-     * 状态： 2: 日常发文  1:自动回复文章
-     */
-    @Column(name = "push_type",
-            columnDefinition = "int(11) DEFAULT NULL COMMENT '状态： 2: 日常发文  1:自动回复文章'")
-    private Integer pushType;
-
-    /**
-     * 视频id
-     */
-    @Column(name = "video_id",
-            columnDefinition = "bigint(16) DEFAULT NULL COMMENT '视频id'")
-    private Long videoId;
-
-}

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

@@ -0,0 +1,50 @@
+package com.tzld.longarticle.recommend.server.model.entity.longArticle;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Table(name = "long_articles_root_source_id")
+public class LongArticlesRootSourceId {
+
+    @Id
+    @Column(name = "root_source_id")
+    private String rootSourceId;
+
+    @Column(name = "account_name")
+    private String accountName;
+
+    @Column(name = "gh_id")
+    private String ghId;
+
+    @Column(name = "article_title")
+    private String articleTitle;
+
+    @Column(name = "request_time")
+    private Long requestTime;
+
+    @Column(name = "trace_id")
+    private String traceId;
+
+    @Column(name = "push_type")
+    private Integer pushType;
+
+    @Column(name = "video_id")
+    private Long videoId;
+
+    @Column(name = "content_id")
+    private String contentId;
+
+    @Column(name = "oss_name")
+    private String ossName;
+
+}

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

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

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

@@ -13,24 +13,25 @@ import com.tzld.longarticle.recommend.server.common.enums.recommend.FeishuRobotI
 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.growth.NewPushMessageCallbackMapper;
+import com.tzld.longarticle.recommend.server.mapper.longArticle.LongArticleBaseMapper;
 import com.tzld.longarticle.recommend.server.model.dto.AccountTypeFansDTO;
 import com.tzld.longarticle.recommend.server.model.dto.NotPublishPlan;
 import com.tzld.longarticle.recommend.server.model.entity.aigc.PublishAccount;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.AccountAvgInfo;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.GetOffVideoCrawler;
-import com.tzld.longarticle.recommend.server.model.entity.crawler.LongArticlesRootSourceId;
 import com.tzld.longarticle.recommend.server.model.entity.crawler.LongArticlesVideo;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.GetOffVideoArticle;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.LongArticlesMatchVideo;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.LongArticlesReadRate;
+import com.tzld.longarticle.recommend.server.model.entity.longArticle.LongArticlesRootSourceId;
 import com.tzld.longarticle.recommend.server.model.param.ArticleFindSourceParam;
 import com.tzld.longarticle.recommend.server.remote.ODPSManager;
 import com.tzld.longarticle.recommend.server.repository.crawler.GetOffVideoCrawlerRepository;
-import com.tzld.longarticle.recommend.server.repository.crawler.LongArticlesRootSourceIdRepository;
 import com.tzld.longarticle.recommend.server.repository.crawler.LongArticlesVideoRepository;
 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.longArticle.LongArticlesRootSourceIdRepository;
 import com.tzld.longarticle.recommend.server.repository.model.PushMessageCallbackExample;
 import com.tzld.longarticle.recommend.server.service.recommend.ArticlePromotionService;
 import com.tzld.longarticle.recommend.server.service.recommend.ArticleService;
@@ -62,6 +63,8 @@ public class XxlJobService {
     @Autowired
     private CrawlerBaseMapper crawlerBaseMapper;
     @Autowired
+    private LongArticleBaseMapper longArticleBaseMapper;
+    @Autowired
     private GetOffVideoCrawlerRepository getOffVideoCrawlerRepository;
     @Autowired
     private LongArticlesVideoRepository longArticlesVideoRepository;
@@ -225,7 +228,7 @@ public class XxlJobService {
                 saveList.removeIf(item -> item.getRootSourceId().equals(existItem.getRootSourceId()));
             }
             if (CollectionUtil.isNotEmpty(saveList)) {
-                crawlerBaseMapper.batchInsertLongArticlesRootSourceId(saveList);
+                longArticleBaseMapper.batchInsertLongArticlesRootSourceId(saveList);
             }
         }
     }

long-article-recommend-service/src/main/resources/mapper/crawler/CrawlerBaseMapper.xml

@@ -10,16 +10,6 @@
         </foreach>
     </insert>
 
-    <insert id="batchInsertLongArticlesRootSourceId">
-        INSERT INTO long_articles_root_source_id (rootSourceId, accountName, ghId, articleTitle, requestTime, trace_id,
-                                                  push_type, video_id)
-        VALUES
-        <foreach collection="list" item="item" separator=",">
-            (#{item.rootSourceId}, #{item.accountName}, #{item.ghId}, #{item.articleTitle}, #{item.requestTime},
-             #{item.traceId}, #{item.pushType}, #{item.videoId})
-        </foreach>
-    </insert>
-
     <insert id="batchInsertAccountAvgInfo">
         INSERT INTO account_avg_info_v3
         (gh_id, position, update_time, account_name, fans, read_avg, like_avg, status, account_type, account_mode,

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

@@ -102,4 +102,14 @@
         </foreach>
     </select>
 
+    <insert id="batchInsertLongArticlesRootSourceId">
+        INSERT INTO long_articles_root_source_id (root_source_id, account_name, gh_id, article_title, request_time,
+        trace_id, push_type, video_id)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.rootSourceId}, #{item.accountName}, #{item.ghId}, #{item.articleTitle}, #{item.requestTime},
+            #{item.traceId}, #{item.pushType}, #{item.videoId})
+        </foreach>
+    </insert>
+
 </mapper>