单小程序文章删除

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

@@ -521,34 +521,26 @@ public class ArticleAuditService {
                     // 获取token
                     String token = wxAccessTokenRemoteService.getAccessToken(entry.getKey());
                     List<LongArticleAuditDelete> list = entry.getValue();
-                    Map<String, List<LongArticleAuditDelete>> msgIdMap = list.stream()
-                            .collect(Collectors.groupingBy(LongArticleAuditDelete::getMsgId));
-                    for (Map.Entry<String, List<LongArticleAuditDelete>> msgIdEntry : msgIdMap.entrySet()) {
-                        String msgId = msgIdEntry.getKey();
-                        List<LongArticleAuditDelete> msgIdList = msgIdEntry.getValue();
-                        Integer pushType = msgIdList.get(0).getPushType();
-                        int status;
-                        String errMsg;
-                        if (Objects.equals(pushType, PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
-                            RequestResult<String> result = wxArticleDeleteService.deleteArticle(token, msgId, 0);
-                            if (result.isSuccess()) {
-                                errMsg = null;
-                                status = ArticleDeleteStatusEnum.SUCCESS.getCode();
+                    for (LongArticleAuditDelete delete : list) {
+                        try {
+                            if (Objects.equals(delete.getPushType(), PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
+                                // 删除文章
+                                RequestResult<String> result = wxArticleDeleteService.deleteArticle(token, delete.getMsgId(), delete.getIndex());
+                                if (result.isSuccess()) {
+                                    delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
+                                } else {
+                                    delete.setStatus(ArticleDeleteStatusEnum.FAIL.getCode());
+                                    delete.setFailReason(result.getFailReason());
+                                }
                             } else {
-                                status = ArticleDeleteStatusEnum.FAIL.getCode();
-                                errMsg = result.getFailReason();
+                                deleteFailAlarmAdd(alarmList, delete.getPublishContentId(), "非自动群发", delete.getIndex());
+                                delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
                             }
-                        } else {
-                            errMsg = null;
-                            status = ArticleDeleteStatusEnum.SUCCESS.getCode();
-                            msgIdList.forEach(delete -> deleteFailAlarmAdd(alarmList, delete.getPublishContentId(), "非自动群发", delete.getIndex()));
-                        }
-                        msgIdList.forEach(delete -> {
-                            delete.setStatus(status);
-                            delete.setFailReason(errMsg);
                             delete.setFinishTimestamp(System.currentTimeMillis());
                             longArticleAuditDeleteRepository.save(delete);
-                        });
+                        } catch (Exception e) {
+                            log.error("articleVideoDelete ghId:{} error", delete.getGhId(), e);
+                        }
                     }
                 } finally {
                     cdl.countDown();