Merge branch 'wyp/0103-listSearch' of Server/long-article-recommend into master

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

@@ -65,7 +65,7 @@ public interface AigcBaseMapper {
 
     List<ProducePlanAuditCheckDTO> getProducePlanProduce(Long timeStart, Long timeEnd, List<String> planIds);
 
-    List<PublishAccountTypeDTO> getAccountTypeList();
+    List<PublishAccountTypeDTO> getAccountTypeList(List<String> ghIds);
 
     List<String> getOnlyMiniprogramArticle(Integer offset, Integer pageSize);
 }

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

@@ -426,12 +426,13 @@ public class ArticleAuditService {
         Map<String, String> pushAccountMap = pushList.stream()
                 .collect(Collectors.toMap(PublishGzhPushDTO::getPushId, PublishGzhPushDTO::getPublishAccountId));
         List<PublishAccount> publishAccountList = publishAccountRepository.getByIdIn(publishAccountIds);
+        List<String> ghIds = publishAccountList.stream().map(PublishAccount::getGhId).collect(Collectors.toList());
         Map<String, String> publishAccountMap = publishAccountList.stream()
                 .collect(Collectors.toMap(PublishAccount::getId, PublishAccount::getGhId));
         List<PublishGzhPushContentRelDTO> groupPushRelList = aigcBaseMapper.getGroupPushRelByPushIdIn(pushIds);
         Map<String, List<PublishGzhPushContentRelDTO>> groupPushRelMap = groupPushRelList.stream()
                 .collect(Collectors.groupingBy(PublishGzhPushContentRelDTO::getPushId));
-        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList();
+        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList(ghIds);
         Map<String, PublishAccountTypeDTO> accountTypeMap = accountTypeList.stream()
                 .collect(Collectors.toMap(PublishAccountTypeDTO::getGhId, Function.identity()));
         // 删除文章
@@ -500,7 +501,8 @@ public class ArticleAuditService {
     @XxlJob("articleVideoDelete")
     public ReturnT<String> articleVideoDelete(String param) {
         List<LongArticleAuditDelete> dealList = longArticleAuditDeleteRepository.getByStatus(ArticleDeleteStatusEnum.WAITING.getCode());
-        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList();
+        List<String> ghIds = dealList.stream().map(LongArticleAuditDelete::getGhId).collect(Collectors.toList());
+        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList(ghIds);
         Map<String, PublishAccountTypeDTO> accountTypeMap = accountTypeList.stream()
                 .collect(Collectors.toMap(PublishAccountTypeDTO::getGhId, Function.identity()));
         List<JSONObject> alarmList = new ArrayList<>();
@@ -666,10 +668,10 @@ public class ArticleAuditService {
         if (CollectionUtils.isEmpty(list)) {
             return;
         }
-        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList();
+        List<String> ghIds = list.stream().map(ArticleDeleteListVO::getGhId).distinct().collect(Collectors.toList());
+        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList(ghIds);
         Map<String, PublishAccountTypeDTO> accountTypeMap = accountTypeList.stream()
                 .collect(Collectors.toMap(PublishAccountTypeDTO::getGhId, Function.identity()));
-        List<String> ghIds = list.stream().map(ArticleDeleteListVO::getGhId).distinct().collect(Collectors.toList());
         List<PublishAccount> publishAccountList = publishAccountRepository.getAllByGhIdIn(ghIds);
         Map<String, PublishAccount> publishAccountMap = publishAccountList.stream().collect(Collectors.toMap(PublishAccount::getGhId, o -> o));
         // 获取发布内容

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

@@ -15,9 +15,13 @@
         join publish_content_output output
           on content.id = output.publish_content_id and output.content_type = 3 AND output.select_status = 1
         where content.status = 2
-          and (content.publish_account_id, output.output) in
+          and content.publish_account_id in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
-            (#{item.publishAccountId}, #{item.title})
+            #{item.publishAccountId}
+        </foreach>
+          and output.output in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item.title}
         </foreach>
     </select>
 
@@ -334,6 +338,12 @@
         LEFT JOIN wx_statistics_group_source t6 on t5.group_source_name = t6.account_source_name
         WHERE t1.plan_status = 1
           AND t3.channel = 5
+        <if test="ghIds != null and ghIds.size() > 0">
+            AND t3.gh_id in
+            <foreach collection="ghIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY t3.id;
     </select>
 

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

@@ -101,7 +101,7 @@ public class XxlJobTest {
 
     @Test
     public void getAccountTypeListTest() {
-        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList();
+        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList(null);
         System.out.println(JSONObject.toJSONString(accountTypeList));
     }
 }