Merge branch 'wyp/0205-deleteReason' of Server/long-article-recommend into master

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

@@ -39,6 +39,9 @@ public class LongArticleAuditDelete {
     @Column(name = "status")
     private Integer status;
 
+    @Column(name = "delete_reason")
+    private String deleteReason;
+
     @Column(name = "fail_reason")
     private String failReason;
 

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

@@ -10,4 +10,7 @@ public class ArticleDangerFindDeleteParam {
     private String title;
     private String wxSn;
 
+    // 1-html手动删除
+    private Integer deleteFlag = 0;
+
 }

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

@@ -366,7 +366,7 @@ public class ArticleAuditService {
         List<String> reMatchTraceIds = traceIds.stream().filter(o -> !deleteTraceIds.contains(o)).collect(Collectors.toList());
         buildReMatchRecord(reMatchTraceIds, response.getVideoOSS(), matchVideoMap);
         // 文章删除
-        buildArticleAuditDelete(publishContentIds);
+        buildArticleAuditDelete(publishContentIds, "手动根据videoId删除");
         return null;
     }
 
@@ -403,7 +403,7 @@ public class ArticleAuditService {
         longArticleBaseMapper.batchInsertArticleReMatchRecord(reMatchRecordList);
     }
 
-    public void buildArticleAuditDelete(List<String> publishContentIds) {
+    public void buildArticleAuditDelete(List<String> publishContentIds, String deleteReason) {
         if (CollectionUtils.isEmpty(publishContentIds)) {
             return;
         }
@@ -447,12 +447,12 @@ public class ArticleAuditService {
             try {
                 String pushId = publishPushIdMap.get(publishContentId);
                 if (!StringUtils.hasText(pushId)) {
-                    deleteFailAlarmAdd(alarmList, publishContentId, "无推送记录", 0);
+                    deleteFailAlarmAdd(alarmList, publishContentId, "无推送记录", 0, deleteReason);
                     continue;
                 }
                 PublishGzhPushDTO publishGzhPushDTO = pushDTOMap.get(pushId);
                 if (Objects.isNull(publishGzhPushDTO)) {
-                    deleteFailAlarmAdd(alarmList, publishContentId, "无推送记录", 0);
+                    deleteFailAlarmAdd(alarmList, publishContentId, "无推送记录", 0, deleteReason);
                     continue;
                 }
                 String publishAccountId = pushAccountMap.get(pushId);
@@ -468,12 +468,12 @@ public class ArticleAuditService {
                 }
                 if (!publishGzhPushDTO.getPushType().equals(PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
                     PushTypeEnum pushTypeEnum = PushTypeEnum.from(publishGzhPushDTO.getPushType());
-                    deleteFailAlarmAdd(alarmList, publishContentId, "推送类型为" + pushTypeEnum.getDescription(), index);
+                    deleteFailAlarmAdd(alarmList, publishContentId, "推送类型为" + pushTypeEnum.getDescription(), index, deleteReason);
                     continue;
                 }
                 String groupPushMsgId = pushIdMap.get(pushId);
                 if (!StringUtils.hasText(groupPushMsgId)) {
-                    deleteFailAlarmAdd(alarmList, publishContentId, "无推送MsgId", index);
+                    deleteFailAlarmAdd(alarmList, publishContentId, "无推送MsgId", index, deleteReason);
                     continue;
                 }
                 LongArticleAuditDelete delete = new LongArticleAuditDelete();
@@ -484,6 +484,7 @@ public class ArticleAuditService {
                 delete.setPublishContentId(publishContentId);
                 delete.setIndex(index);
                 delete.setStatus(StatusEnum.ZERO.getCode());
+                delete.setDeleteReason(deleteReason);
                 delete.setCreateTimestamp(System.currentTimeMillis());
                 longArticleAuditDeleteRepository.save(delete);
             } catch (Exception e) {
@@ -493,11 +494,12 @@ public class ArticleAuditService {
         deleteFailAlarm(alarmList, accountTypeMap);
     }
 
-    private void deleteFailAlarmAdd(List<JSONObject> alarmList, String publishContentId, String errMsg, Integer index) {
+    private void deleteFailAlarmAdd(List<JSONObject> alarmList, String publishContentId, String errMsg, Integer index, String deleteReason) {
         JSONObject alarm = new JSONObject();
         alarm.put("publishContentId", publishContentId);
         alarm.put("errMsg", errMsg);
         alarm.put("index", index);
+        alarm.put("deleteReason", deleteReason);
         alarmList.add(alarm);
     }
 
@@ -590,7 +592,7 @@ public class ArticleAuditService {
                             }
                         } else {
                             msgIdList.forEach(delete -> {
-                                deleteFailAlarmAdd(alarmList, delete.getPublishContentId(), "非自动群发", delete.getIndex());
+                                deleteFailAlarmAdd(alarmList, delete.getPublishContentId(), "非自动群发", delete.getIndex(), delete.getDeleteReason());
                                 delete.setStatus(ArticleDeleteStatusEnum.SUCCESS.getCode());
                                 delete.setFinishTimestamp(System.currentTimeMillis());
                                 longArticleAuditDeleteRepository.save(delete);
@@ -645,6 +647,7 @@ public class ArticleAuditService {
             row.put("index", String.valueOf(alarm.getInteger("index")));
             row.put("title", publishContent.getTitle());
             row.put("err_msg", alarm.getString("errMsg"));
+            row.put("delete_reason", alarm.getString("deleteReason"));
             rows.add(row);
         }
         FeishuTableDTO tableDTO = FeishuTableDTO.createTable("文章删除失败", columns, rows, false);
@@ -679,6 +682,9 @@ public class ArticleAuditService {
         FeishuTableDTO.Column errMsgColumn = FeishuTableDTO.createFeishuColumns(
                 FieshuTableColumnDataTypeEnum.TEXT.getType(), "err_msg", "原因", null);
         columns.add(errMsgColumn);
+        FeishuTableDTO.Column deleteReasonColumn = FeishuTableDTO.createFeishuColumns(
+                FieshuTableColumnDataTypeEnum.TEXT.getType(), "delete_reason", "删除原因", null);
+        columns.add(deleteReasonColumn);
         return columns;
     }
 
@@ -716,7 +722,7 @@ public class ArticleAuditService {
 
         // 根据已发布文章查找推送id 并删除
         List<String> publishContentIds = publishContents.stream().map(PublishContentDTO::getId).collect(Collectors.toList());
-        buildArticleAuditDelete(publishContentIds);
+        buildArticleAuditDelete(publishContentIds, param.getDeleteFlag() == 1 ? "html手动删除" : "违规检查删除");
         buildArticleUnsafeTitle(param.getGhId(), titleMd5, param.getTitle());
     }
 
@@ -837,7 +843,7 @@ public class ArticleAuditService {
             List<String> existsIds = exists.stream().map(LongArticleAuditDelete::getPublishContentId).collect(Collectors.toList());
             publishContentIds.removeAll(existsIds);
             if (CollectionUtils.isNotEmpty(publishContentIds)) {
-                buildArticleAuditDelete(publishContentIds);
+                buildArticleAuditDelete(publishContentIds, "单小程序文章定期删除");
             }
             pageNum++;
         }

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

@@ -204,7 +204,7 @@ public class ArticleVideoAuditService {
         List<PublishContentMiniprogramDTO> publishContents = publishContentMapper.getPublishContentByTraceIdIn(traceIds);
         List<String> publishContentIds = publishContents.stream().map(PublishContentMiniprogramDTO::getPublishContentId)
                 .collect(Collectors.toList());
-        articleAuditService.buildArticleAuditDelete(publishContentIds);
+        articleAuditService.buildArticleAuditDelete(publishContentIds, "视频审核不通过删除");
     }
 
     public List<String> getFilterValue(AuditFilterParam param) {

long-article-recommend-service/src/main/resources/static/internal/articleDelete.html

@@ -236,7 +236,7 @@
                 'Content-Type': 'application/json',
                 'Access-Control-Allow-Origin': '*'
             },
-            body: JSON.stringify({title: title, ghId: ghId})
+            body: JSON.stringify({title: title, ghId: ghId, deleteFlag: 1})
         })
             .then(response => response.json())
             .then(data => {