服务号分组群发 通过pushType控制

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -123,9 +123,6 @@ public class CoreServiceImpl implements CoreService {
     @Autowired
     private DemandSearchQueueMapper demandSearchQueueMapper;
 
-    @ApolloJsonValue("${fwhGhIdList:[]}")
-    private List<String> fwhGhIdList;
-
     @Value("${content.mini.video.num:3}")
     private Integer miniVideoNum;
 
@@ -715,9 +712,7 @@ public class CoreServiceImpl implements CoreService {
             if (sendCount >= 1) {
                 return false;
             }
-            if ((fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId())
-                    && Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()))
-                    || (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal()))) {
+            if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())) {
                 // 服务号分组求发每天最多尝试10次
                 if (planAccount.getRetryCount() >= 10) {
                     planAccount.setStatus(3);
@@ -868,9 +863,7 @@ public class CoreServiceImpl implements CoreService {
             pushContentList.add(contentParam);
         }
 
-        if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())
-                || (fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId())
-                && Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()))) {
+        if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())) {
             pushBatchGroupPushTask(planAccount, pushContentList, sendIds);
         } else {
             CreatePushTaskParam gzhPushParam = getCreatePushTaskParam(planAccount, pushContentList);
@@ -1502,9 +1495,7 @@ public class CoreServiceImpl implements CoreService {
                         Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.INFINITE_PUBLISH_PUSH_DRAFT.getVal())) {
                     planAccountService.updateStatus(2, planAccountId);
                 }
-                if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())
-                        || (fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId())
-                        && Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()))) {
+                if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())) {
                     GroupSendResultExample groupSendResultExample = new GroupSendResultExample();
                     groupSendResultExample.createCriteria().andPushIdEqualTo(pushId);
                     List<GroupSendResult> groupSendResults = groupSendResultMapper.selectByExample(groupSendResultExample);