推送优化

yujian

2019-03-15 fa365e1770746e272b3bdb623d29285e3e34def7

推送优化

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.admin;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



@@ -110,24 +111,41 @@


        try {

            

            String[] uidArray = null;

            if (uids != null) {

                uidArray = uids.split(",");

            List<String> listuid = null;

            if (uids != null && uids.trim().length() > 0) {

                listuid = Arrays.asList(uids.split(","));

                if (listuid == null || listuid.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户id格式不正确"));

                    return;

                }

            }

            

            

            List<String> listVersion = null;

            if (versions != null && versions.trim().length() > 0) {

                listVersion  = Arrays.asList(versions.split(","));

                List<String> list = Arrays.asList(versions.split(","));

				
                if (list != null && list.size() > 0) {

                    listVersion = new ArrayList<String>();

                    for (String version: list) {

                        if (version != null && version.trim().length() > 0) {

                            listVersion.add(version.trim());

                        }

                    }

            }

            

            if (uidArray == null) {

                if (listVersion == null || listVersion.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("版本号格式不正确"));

                    return;

                }

            }

			
            if (listuid == null) {

                // 全推

                pushService.pushGoods(null, title, content, url, listVersion);

            } else {

                // 部分用户推送

                for (int i = 0; i < uidArray.length; i++) {

                    String str_uid = uidArray[i];

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushGoods(Long.parseLong(str_uid), url, title, content, listVersion);

                    }

@@ -169,24 +187,40 @@


        try {



            String[] uidArray = null;

            if (uids != null) {

                uidArray = uids.split(",");

            List<String> listuid = null;

            if (uids != null && uids.trim().length() > 0) {

                listuid = Arrays.asList(uids.split(","));

                if (listuid == null || listuid.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户id格式不正确"));

                    return;

            }



            }

            

            List<String> listVersion = null;

            if (versions != null && versions.trim().length() > 0) {

                listVersion  = Arrays.asList(versions.split(","));

                List<String> list = Arrays.asList(versions.split(","));

				
                if (list != null && list.size() > 0) {

                    listVersion = new ArrayList<String>();

                    for (String version: list) {

                        if (version != null && version.trim().length() > 0) {

                            listVersion.add(version.trim());

                        }

                    }

            }

            

            if (uidArray == null) {

                if (listVersion == null || listVersion.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("版本号格式不正确"));

                    return;

                }

            }

			
            if (listuid == null) {

                // 全推

                pushService.pushUrl(null, title, content, url, listVersion);

            } else {

                // 部分推送

                for (int i = 0; i < uidArray.length; i++) {

                    String str_uid = uidArray[i];

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushUrl(Long.parseLong(str_uid), url, title, content, listVersion);

                    }

@@ -221,23 +255,40 @@


        try {



            String[] uidArray = null;

            if (uids != null) {

                uidArray = uids.split(",");

            List<String> listuid = null;

            if (uids != null && uids.trim().length() > 0) {

                listuid = Arrays.asList(uids.split(","));

                if (listuid == null || listuid.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户id格式不正确"));

                    return;

                }

            }

            

            List<String> listVersion = null;

            if (versions != null && versions.trim().length() > 0) {

                listVersion  = Arrays.asList(versions.split(","));

                List<String> list = Arrays.asList(versions.split(","));

				
                if (list != null && list.size() > 0) {

                    listVersion = new ArrayList<String>();

                    for (String version: list) {

                        if (version != null && version.trim().length() > 0) {

                            listVersion.add(version.trim());

                        }

                    }

            }

            

            if (uidArray == null) {

                if (listVersion == null || listVersion.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("版本号格式不正确"));

                    return;

                }

            }

			
            if (listuid == null) {

                // 全推

                pushService.pushZNX(null, title, content, listVersion);

            } else {

                // 部分推送

                for (int i = 0; i < uidArray.length; i++) {

                    String str_uid = uidArray[i];

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushZNX(Long.parseLong(str_uid), title, content, listVersion);



@@ -274,23 +325,40 @@


        try {



            String[] uidArray = null;

            if (uids != null) {

                uidArray = uids.split(",");

            List<String> listuid = null;

            if (uids != null && uids.trim().length() > 0) {

                listuid = Arrays.asList(uids.split(","));

                if (listuid == null || listuid.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户id格式不正确"));

                    return;

                }

            }



            List<String> listVersion = null;

            if (versions != null && versions.trim().length() > 0) {

                listVersion  = Arrays.asList(versions.split(","));

                List<String> list = Arrays.asList(versions.split(","));

				
                if (list != null && list.size() > 0) {

                    listVersion = new ArrayList<String>();

                    for (String version: list) {

                        if (version != null && version.trim().length() > 0) {

                            listVersion.add(version.trim());

                        }

                    }

            }

            

            if (uidArray == null) {

                if (listVersion == null || listVersion.size() == 0) {

                    JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("版本号格式不正确"));

                    return;

                }

            }

			
            if (listuid == null) {

                // 全推

                pushService.pushBaiChuanUrl(null, title, content, url, listVersion);

            } else {

                // 部分推送

                for (int i = 0; i < uidArray.length; i++) {

                    String str_uid = uidArray[i];

                for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listVersion);

                    }


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java

@@ -147,29 +147,36 @@
            throw new PushCouponException(1, "标题或内容不能为空");

        }

        

		
        List<String> listuid = null;

        String uids = pushCoupon.getUids();

        if (uids != null && uids.trim().length() > 0) {

            listuid = Arrays.asList(uids.split(","));

            if (listuid == null || listuid.size() == 0) {

                throw new PushCouponException(1, "用户id格式不正确");

            }

        }

		
        List<String> listVersion = null;

        String versions = pushCoupon.getVersions();

        if (versions != null && versions.trim().length() > 0) {

            listVersion  = Arrays.asList(versions.split(","));

            if (listVersion == null || listVersion.size() == 0) {

                throw new PushCouponException(1, "版本号格式不正确\"");

        }

        String uids = pushCoupon.getUids();

        if (uids == null || uids.trim().length() == 0) {

        }

		
        if (listuid == null) {

            // 全推

            pushService.pushWelfareCenter(null, title, content, listVersion);

            

        } else {

            // 指定用户推送

            String[] uidArray = uids.split(",");

			
            if (uidArray != null) {

                for (int i = 0; i < uidArray.length; i++) {

                    String str_uid = uidArray[i];

            for (String str_uid: listuid) {

                    if (str_uid != null && str_uid.trim().length() > 0) {

                        pushService.pushWelfareCenter(Long.parseLong(str_uid), title, content, listVersion);

                    }

                }

            }

			
        }

        

        // 已推送


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java

@@ -16,6 +16,7 @@
import com.yeshi.fanli.entity.push.PushGoodsGroup;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushCouponException;

import com.yeshi.fanli.exception.push.PushGoodsException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

@@ -235,6 +236,9 @@
        String versions = pushGoods.getVersions();

        if (versions != null && versions.trim().length() > 0) {

            listVersion  = Arrays.asList(versions.split(","));

            if (listVersion == null || listVersion.size() == 0) {

                throw new PushCouponException(1, "版本号格式不正确\"");

            }

        }

        

        if (goodsList.size() == 1) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -185,6 +185,17 @@
    public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException {

        iosPushService.pushBaiChuanUrl(uid, title, content, url, listVersion);

        xmPushService.pushBaiChuanUrl(uid, title, content, url, listVersion);

		
        // 插入推送记录

        PushRecord pushRecord = new PushRecord();

        pushRecord.setTitle(title);

        pushRecord.setUid(uid);

        pushRecord.setState(1); // 成功

        pushRecord.setType(PushController.BAICHUAN); // 类型：百川

        pushRecord.setAppName(Constant.systemCommonConfig.getProjectChineseName());

        pushRecord.setCreatetime(java.lang.System.currentTimeMillis());

		
        pushRecordMapper.insertSelective(pushRecord);

    }



    @Override