Merge branch 'wyp/0612-fix' of Server/long-article-recommend into master

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

@@ -71,6 +71,4 @@ public interface PublishContentMapper {
     List<PublishPlanMiniprogramTask> getAccountMiniprogramTaskList(String id);
 
     List<PublishAccountRemarkDTO> getPublishAccountRemarkList(List<String> accountIds);
-
-    List<PublishPlanAccountDTO> getGroupPublishPlanAccounts();
 }

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

@@ -3,6 +3,7 @@ package com.tzld.longarticle.recommend.server.mapper.longArticle;
 import com.tzld.longarticle.recommend.server.model.dto.GetOffVideos;
 import com.tzld.longarticle.recommend.server.model.dto.LongArticlesCrawlerVideos;
 import com.tzld.longarticle.recommend.server.model.dto.LongArticlesMatchVideos;
+import com.tzld.longarticle.recommend.server.model.dto.aigc.PublishPlanAccountDTO;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.*;
 import com.tzld.longarticle.recommend.server.model.param.ArticleVideoPoolSourceParam;
 import com.tzld.longarticle.recommend.server.model.vo.CategoryGroupFunnelExport;
@@ -109,4 +110,6 @@ public interface LongArticleBaseMapper {
     void updatePublishContentGzhWaitingStatus(String planId, String accountId, List<String> contentIds, Integer status, Long updateTimestamp);
 
     void updatePublishContentGzhWaitingStatusByIds(List<String> contentIds, Integer status);
+
+    List<PublishPlanAccountDTO> getGroupPublishPlanAccounts();
 }

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

@@ -996,7 +996,7 @@ public class XxlJobService {
                 ArticleVideoAuditStatusEnum.PASS.getCode(), now - (86400000 * 3), now);
         List<String> newAuditIds = newAuditList.stream().map(LongArticleTitleAudit::getContentId).collect(Collectors.toList());
         // 获取已存在数
-        List<PublishPlanAccountDTO> existAccountList = publishContentMapper.getGroupPublishPlanAccounts();
+        List<PublishPlanAccountDTO> existAccountList = longArticleBaseMapper.getGroupPublishPlanAccounts();
         Map<String, Map<String, Integer>> existAccountMap = existAccountList.stream().collect(
                 Collectors.groupingBy(PublishPlanAccountDTO::getPlanId,
                         Collectors.toMap(PublishPlanAccountDTO::getAccountId, PublishPlanAccountDTO::getCnt)));

long-article-recommend-service/src/main/resources/mapper/aigc/PublishContentMapper.xml

@@ -325,11 +325,4 @@
         </foreach>
     </select>
 
-    <select id="getGroupPublishPlanAccounts"
-            resultType="com.tzld.longarticle.recommend.server.model.dto.aigc.PublishPlanAccountDTO">
-        select plan_id, publish_account_id, count(1) as cnt
-        from publish_content_gzh_waiting
-        GROUP BY plan_id, publish_account_id
-    </select>
-
 </mapper>

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

@@ -458,4 +458,11 @@
         </foreach>
     </update>
 
+    <select id="getGroupPublishPlanAccounts"
+            resultType="com.tzld.longarticle.recommend.server.model.dto.aigc.PublishPlanAccountDTO">
+        select plan_id, publish_account_id, count(1) as cnt
+        from publish_content_gzh_waiting
+        GROUP BY plan_id, publish_account_id
+    </select>
+
 </mapper>