Merge branch 'wyp/1224-deleteAlarm' of Server/long-article-recommend into master

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/dto/PublishAccountTypeDTO.java

@@ -10,6 +10,6 @@ public class PublishAccountTypeDTO {
     private Integer followerCount;
     private String accountSourceName;
     private String modeType;
-    private String accountTpe;
+    private String accountType;
     private String status;
 }

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

@@ -396,7 +396,7 @@ public class ArticleAuditService {
         PublishAccount publishAccount = publishAccountRepository.getById(publishContent.getPublishAccountId());
         String publishTime = DateUtils.timestampToYMDStr(publishContent.getPublishTimestamp() / 1000, "yyyyMMdd");
         PublishAccountTypeDTO accountTypeDTO = accountTypeMap.get(publishAccount.getGhId());
-        String accountType = Objects.nonNull(accountTypeDTO) ? accountTypeDTO.getAccountTpe() : "未知";
+        String accountType = Objects.nonNull(accountTypeDTO) ? accountTypeDTO.getAccountSourceName() : "未知";
         // 无法自动删除 发送飞书通知 人工删除
         FeishuMessageSender.sendWebHookMessage(FeishuRobotIdEnum.ARTICLE_DELETE.getRobotId(),
                 "【文章删除失败】\n" +

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

@@ -1,10 +1,12 @@
 package com.tzld.longarticle.recommend.server;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.longarticle.recommend.server.mapper.aigc.AigcBaseMapper;
 import com.tzld.longarticle.recommend.server.mapper.longArticle.LongArticleBaseMapper;
 import com.tzld.longarticle.recommend.server.model.dto.CrawlerContent;
 import com.tzld.longarticle.recommend.server.model.dto.ProduceContentDTO;
+import com.tzld.longarticle.recommend.server.model.dto.PublishAccountTypeDTO;
 import com.tzld.longarticle.recommend.server.model.entity.aigc.ProducePlanExeRecord;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.ArticleCategory;
 import com.tzld.longarticle.recommend.server.model.entity.longArticle.ArticlePoolPromotionSource;
@@ -96,4 +98,10 @@ public class XxlJobTest {
         longArticleBaseMapper.batchInsertArticleCategory(saveList);
 
     }
+
+    @Test
+    public void getAccountTypeListTest() {
+        List<PublishAccountTypeDTO> accountTypeList = aigcBaseMapper.getAccountTypeList();
+        System.out.println(JSONObject.toJSONString(accountTypeList));
+    }
 }