推送服务完善

admin

2021-07-03 ea68e8f8c00c0178037a9f1cc6dc1663bde913b8

 service-push/src/main/java/com/ks/push/manager/PushManager.java

@@ -7,6 +7,7 @@
import com.ks.push.pojo.DO.BPushDeviceToken;
import com.ks.push.pojo.DO.BPushPlatformAppInfo;
import com.ks.push.pojo.DO.BPushTask;
import com.ks.push.pojo.DO.BPushTaskExcuteResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.RedisTemplate;
@@ -15,9 +16,7 @@

import javax.annotation.Resource;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.concurrent.TimeUnit;

/**
@@ -42,9 +41,6 @@
    @Resource
    private PushExcuteResultManager pushExcuteResultManager;

    @Resource
    private CMQManager cmqManager;


    /**
     * 创建推送任务
@@ -58,6 +54,11 @@
            task.setCreateTime(new Date());
        }
        task.setId(BPushTask.createId());

        if (task.getState() == null) {
            task.setState(BPushTask.STATE_NOT_START);
        }

        bPushTaskDao.save(task);
        logger.info("创建推送成功#taskId:{}", task.getId());
        return task.getId();
@@ -90,29 +91,51 @@
            // 查询可推送的平台
            List<BPushPlatformAppInfo> list = bPushPlatformAppInfoManager.listByAppCode(task.getAppCode());

            //先初始化推送结果数据数据
            List<BPushTaskExcuteResult> resultList = new ArrayList<>();
            Map<String, Long> resultCountMap = new HashMap<>();
            for (BPushPlatformAppInfo appInfo : list) {
                long count = pushDeviceTokenManager.count(task.getAppCode(), appInfo.getPlatform(), task.getFilter());
                if (count > 0) {
                    hasDevice = true;
                    //初始化推送结果数据
                    pushExcuteResultManager.initPushExcuteResult(taskId, appInfo.getPlatform(), count);
                    //将数据加入到cmq
                    int pageSize = 500;
                    int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
                    for (int page = 0; page < totalPage; page++) {
                        List<BPushDeviceToken> deviceTokenList = pushDeviceTokenManager.list(task.getAppCode(), appInfo.getPlatform(), task.getFilter(), page + 1, pageSize);
                        List<String> tokenList = new ArrayList<>();
                        for (BPushDeviceToken deviceToken : deviceTokenList) {
                            tokenList.add(deviceToken.getToken());
                        }
                        BPushDeviceDataSet dataSet = new BPushDeviceDataSet(tokenList, page + "", taskId);
                        cmqManager.addToPushQueue(appInfo.getPlatform(), dataSet);
                    }

                    logger.info("加入推送队列#任务Id:{}#平台:{}#推送数量:{}", task.getId(), appInfo.getPlatform().name(), count);
                    BPushTaskExcuteResult result = pushExcuteResultManager.initPushExcuteResult(taskId, appInfo.getPlatform(), count);
                    resultCountMap.put(result.getId(), count);
                    resultList.add(result);
                }
            }


            for (BPushTaskExcuteResult result : resultList) {
                long count = resultCountMap.get(result.getId());
                int pageSize = 500;
                int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
                long totalValidCount = 0L;

                //初始化批量推送的计数
                for (int page = 0; page < totalPage; page++) {
                    pushExcuteResultManager.startBatchPush(taskId, result.getPushPlatform(), page + "");
                }

                for (int page = 0; page < totalPage; page++) {
                    List<BPushDeviceToken> deviceTokenList = pushDeviceTokenManager.list(task.getAppCode(), result.getPushPlatform(), task.getFilter(), page + 1, pageSize);

                    List<String> tokenList = new ArrayList<>();
                    for (BPushDeviceToken deviceToken : deviceTokenList) {
                        //TODO 时间判断
                        tokenList.add(deviceToken.getToken());
                    }
                    totalValidCount += tokenList.size();
                    BPushDeviceDataSet dataSet = new BPushDeviceDataSet(tokenList, page + "", taskId);
                    //最后一页
                    if (page == totalPage - 1 && totalValidCount != count) {
                        //修改总数
                        pushExcuteResultManager.setDeviceCount(result.getId(), totalValidCount);
                    }
                    CMQManager.getInstance().addToPushQueue(result.getPushPlatform(), dataSet);
                }
                logger.info("加入推送队列#任务Id:{}#平台:{}#推送数量:{}", task.getId(), result.getPushPlatform().name(), count);
            }
        } finally {
            redisTemplate.delete(key);
        }
@@ -126,6 +149,12 @@
    }


    /**
     * 暂停推送
     *
     * @param taskId
     * @throws BPushTaskException
     */
    public void pausePush(String taskId) throws BPushTaskException {
        //验证状态
        BPushTask task = bPushTaskDao.get(taskId);
@@ -135,13 +164,16 @@
        if (task.getState() != BPushTask.STATE_PUSHING) {
            throw new BPushTaskException(2, "处于推送中状态的推送才可暂停");
        }

        updateState(taskId, BPushTask.STATE_PAUSED, null);

        logger.info("暂停推送#taskId:{}", task.getId());

    }

    /**
     * 重新推送（处于暂停状态的数据才能重新推送）
     *
     * @param taskId
     * @throws BPushTaskException
     */
    public void reStartPush(String taskId) throws BPushTaskException {
        //验证状态
        BPushTask task = bPushTaskDao.get(taskId);
@@ -151,12 +183,16 @@
        if (task.getState() != BPushTask.STATE_PAUSED) {
            throw new BPushTaskException(2, "处于暂停状态的推送才可重新开始推送");
        }

        updateState(taskId, BPushTask.STATE_PUSHING, "重新推送");

        logger.info("重新推送#taskId:{}", task.getId());
    }

    /**
     * 取消推送（处于暂停/推送中状态的推送才可取消）
     *
     * @param taskId
     * @throws BPushTaskException
     */
    public void cancelPush(String taskId) throws BPushTaskException {
        //验证状态
        BPushTask task = bPushTaskDao.get(taskId);