Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -4,17 +4,18 @@


import javax.annotation.Resource;



import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.controller.admin.PushController;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.push.PushRecordMapper;

import com.yeshi.fanli.entity.AppVersionInfo;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.system.SystemZnx;

import com.yeshi.fanli.entity.xinge.PushRecord;

import com.yeshi.fanli.exception.PushException;

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

import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;

import com.yeshi.fanli.service.inter.push.HWPushService;

import com.yeshi.fanli.service.inter.push.IOSPushService;

@@ -59,10 +60,14 @@


   @Resource

   private AccountMessageMapper accountMessageMapper;



   @Async("pushExecutor")

	
   @Resource

   private AppVersionService appVersionService;

	
	
   @Override

   public void pushGoods(Long uid, String url, String title, String content, List<String> listVersion) throws PushException {

   public void pushGoods(Long uid,  String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException {

      String gids = url.split("id=")[1];

      String gid = gids.split("&")[0];

      if (StringUtil.isNullOrEmpty(gid))

@@ -71,8 +76,29 @@
         throw new PushException(1, "请填写推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "请填写推送内容"); 



		
		
      /* IOS端推送   (注明：list等于 'null' 时全推， size等于0 不做推送) */

      if (listIOS == null || listIOS.size() > 0) {

         // 限制推送版本号：0

         String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS); 
         if(listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {

            iosPushService.pushGoods(uid, Long.parseLong(gid), title, content, codes);

         }

      }

		
      /* Android端推送    (注明：list等于 'null' 时全推， size等于0 不做推送)  */

      if (listAndroid == null || listAndroid.size() > 0) {

         // 限制推送版本号：0

         String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid); 
         if(listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {

            xmPushService.pushGoods(uid, Long.parseLong(gid), title, content, versions);

         }

      }

		
		
      PushRecord pushRecord = new PushRecord();

      pushRecord.setUid(uid);

      pushRecord.setState(1);

      pushRecord.setType(PushController.GOODS); // 都成功

      pushRecord.setUrl(url);

@@ -80,17 +106,13 @@
      pushRecord.setAppName(Constant.systemCommonConfig.getProjectChineseName());

      pushRecord.setAccount(1);

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



      xmPushService.pushGoods(uid, Long.parseLong(gid), title, content, listVersion);

      iosPushService.pushGoods(uid, Long.parseLong(gid), title, content, listVersion);

      // hwPushService.pushGoods(uid, Long.parseLong(gid), title, content);



      pushRecordMapper.insertSelective(pushRecord);

   }



   @Async("pushExecutor")

	
   @Override

   public void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException {

   public void pushUrl(Long uid, String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException {



      if (StringUtil.isNullOrEmpty(url))

         throw new PushException(1, "无推送链接");

@@ -98,106 +120,305 @@
         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");



		
		
      /* IOS端推送   (注明：list等于 'null' 时全推， size等于0 不做推送) */

      if (listIOS == null || listIOS.size() > 0) {

         // 限制推送版本号：0

         String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS); 
         if(listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {

            iosPushService.pushUrl(uid, url, title, content, codes);

         }

      }

		
      /* Android端推送    (注明：list等于 'null' 时全推， size等于0 不做推送)  */

      if (listAndroid == null || listAndroid.size() > 0) {

         // 限制推送版本号：0

         String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid); 
         if(listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {

            xmPushService.pushUrl(uid, url, title, content, versions);

            hwPushService.pushUrl(uid, url, title, content, versions);

         }

      }

		
		
      PushRecord pushRecord = new PushRecord();

      pushRecord.setUid(uid);

      pushRecord.setState(1);

      pushRecord.setType(PushController.URL);

      pushRecord.setUrl(url);

      pushRecord.setTitle(title);

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

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



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

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

      hwPushService.pushUrl(uid, url, title, content, listVersion);

      pushRecordMapper.insertSelective(pushRecord);

   }



   @Async("pushExecutor")

	
   @Override

   public void pushZNX(Long uId, String title, String content, List<String> listVersion) throws PushException {

   public void pushZNX(Long uId, String title, String content, List<String> listIOS,

         List<String> listAndroid) throws PushException {

      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");



      SystemZnx systemZnx = null;

      AccountMessage accountMessage = null;

		
      /* 无uid , 广播 数据插入系统表 */

      if (uId == null || uId == 0) {

         // 插入数据库（系统站内信数据）

         SystemZnx systemZnx = new SystemZnx();

         systemZnx = new SystemZnx();

         systemZnx.setTitle(title);

         systemZnx.setContent(content);

         systemZnx.setCreateTime(System.currentTimeMillis());

         systemZnxService.save(systemZnx);



         PushRecord pushRecord = new PushRecord();

         pushRecord.setTitle(title);

         pushRecord.setState(1); // 成功

         pushRecord.setType(4); // 类型：站内信

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

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

			
         xmPushService.pushZNX(uId, null, systemZnx, listVersion);

         iosPushService.pushZNX(uId, null, systemZnx, listVersion);

         hwPushService.pushZNX(uId, null, systemZnx, listVersion);

         // 插入推送记录

         pushRecordMapper.insertSelective(pushRecord);

      } else {

         AccountMessage accountMessage = new AccountMessage();

         accountMessage = new AccountMessage();

         accountMessage.setCreateTime(System.currentTimeMillis());

         accountMessage.setIsOpen(false);

         accountMessage.setUserInfo(new UserInfo(uId));

         accountMessage.setTitle(title);

         accountMessage.setContent(content);

         accountMessageMapper.insertSelective(accountMessage);



         xmPushService.pushZNX(uId, accountMessage, null, listVersion);

         iosPushService.pushZNX(uId, accountMessage, null, listVersion);

         hwPushService.pushZNX(uId, accountMessage, null, listVersion);



         // 插入推送记录

         PushRecord pushRecord = new PushRecord();

         pushRecord.setTitle(title);

         pushRecord.setUid(uId);

         pushRecord.setState(1); // 成功

         pushRecord.setType(PushController.ZNX); // 类型：站内信

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

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

			
         pushRecordMapper.insertSelective(pushRecord);

      }

		
		
      /* IOS端推送   (注明：list等于 'null' 时全推， size等于0 不做推送) */

      if (listIOS == null || listIOS.size() > 0) {

         // 限制推送版本号：0

         String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS); 
         if(listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {

            iosPushService.pushZNX(uId, accountMessage, systemZnx, codes);

         }

      }

		
      /* Android端推送    (注明：list等于 'null' 时全推， size等于0 不做推送)  */

      if (listAndroid == null || listAndroid.size() > 0) {

         // 限制推送版本号：0

         String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid); 
         if(listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {

            xmPushService.pushZNX(uId, accountMessage, systemZnx, versions);

            hwPushService.pushZNX(uId, accountMessage, systemZnx, versions);

         }

      }

		
		
      // 插入推送记录

      PushRecord pushRecord = new PushRecord();

      pushRecord.setUid(uId);

      pushRecord.setTitle(title);

      pushRecord.setState(1); // 成功

      pushRecord.setType(PushController.ZNX); // 类型：站内信

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

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

      pushRecordMapper.insertSelective(pushRecord);

   }



	
   @Override

   public void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException {

   public void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listIOS,

         List<String> listAndroid) throws PushException {

      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");

      iosPushService.pushWEEX(uid, title, content, weexUrl, listVersion);

   }



   @Override

   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);

		
      // 适用版本 1.4.8及以后 推送weex页面

		
      /* IOS端推送   (注明：list等于 'null' 时全推， size等于0 不做推送) */

      if (listIOS == null || listIOS.size() > 0) {

         // 限制推送版本号：0

         String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS); 
         if(listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {

            iosPushService.pushWEEX(uid, title, content, weexUrl, codes);

         }

      }

		
      /* Android端推送    (注明：list等于 'null' 时全推， size等于0 不做推送)  */

      if (listAndroid == null || listAndroid.size() > 0) {

         // 限制推送版本号：31

         String versions = getEffectiveVersions(0, AppVersionInfo.PLATFORM_ANDROID, listAndroid); 
         if(listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {

            xmPushService.pushWEEX(uid, title, content, weexUrl, versions);

         }

      }

		
      

      // 插入推送记录

      PushRecord pushRecord = new PushRecord();

      pushRecord.setTitle(title);

      pushRecord.setUid(uid);

      pushRecord.setState(1); // 成功

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

      pushRecord.setType(PushController.WEEX); // 类型：WEEX

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

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

		
      pushRecordMapper.insertSelective(pushRecord);

   }



	
   @Override

   public void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException {

      iosPushService.pushWelfareCenter(uid, title, content, listVersion);

      xmPushService.pushWelfareCenter(uid, title, content, listVersion);

   public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listIOS,

         List<String> listAndroid) throws PushException {

	
      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");

		
      // 适用版本 1.4.8及以后 推送百川网页

		
      /* IOS端推送   (注明：list等于 'null' 时全推， size等于0 不做推送) */

      if (listIOS == null || listIOS.size() > 0) {

         // 限制推送版本号：0

         String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS); 
         if(listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {

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

         }

      }

		
      /* Android端推送    (注明：list等于 'null' 时全推， size等于0 不做推送)  */

      if (listAndroid == null || listAndroid.size() > 0) {

         // 限制推送版本号：31

         String versions = getEffectiveVersions(31, AppVersionInfo.PLATFORM_ANDROID, listAndroid); 
         if(listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {

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

         }

      }

		
		
      // 插入推送记录

      PushRecord pushRecord = new PushRecord();

      pushRecord.setUrl(url);

      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

   public void pushWelfareCenter(Long uid, String title, String content, List<String> listIOS,

         List<String> listAndroid) throws PushException {

		
      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");

		
		
      /* IOS端推送   (注明：list等于 'null' 时全推， size等于0 不做推送) */

      if (listIOS == null || listIOS.size() > 0) {

         // 限制推送版本号：0

         String codes = getEffectiveVersionCodes(0, AppVersionInfo.PLATFORM_IOS, listIOS); 
         if(listIOS == null || (listIOS.size() > 0 && codes != null && codes.trim().length() > 0)) {

            iosPushService.pushWelfareCenter(uid, title, content, codes);

         }

      }

		
      /* Android端推送    (注明：list等于 'null' 时全推， size等于0 不做推送)  */

      if (listAndroid == null || listAndroid.size() > 0) {

         // 限制推送版本号：36

         String versions = getEffectiveVersions(36, AppVersionInfo.PLATFORM_ANDROID, listAndroid); 
         if(listAndroid == null || (listAndroid.size() > 0 && versions != null && versions.trim().length() > 0)) {

            xmPushService.pushWelfareCenter(uid, title, content, versions);

         }

      }

		
		
      // 插入推送记录

      PushRecord pushRecord = new PushRecord();

      pushRecord.setTitle(title);

      pushRecord.setUid(uid);

      pushRecord.setState(1); // 成功

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

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

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

      pushRecordMapper.insertSelective(pushRecord);

   }



	
	
   /**

    * 查询能推送版本号

    * @param versionCode

    * @param listVersion

    * @return

    */

   private String getEffectiveVersions(int minCode, String type, List<String> listVersion) throws PushException{

		
      if (minCode == 0 && listVersion == null) {

         return null;

      }

		
      String versions = "";

      if (listVersion == null) {

         List<AppVersionInfo> list = appVersionService.listByPlatformAndMinVersionCode(type, minCode);

         if (list != null) {

            for (AppVersionInfo appVersion : list) {

               versions += appVersion.getVersion() + ",";

            }

         }

      } else {

         List<AppVersionInfo> list = appVersionService.listByVersions(type, listVersion);

         if (list != null) {

            for (AppVersionInfo appVersion : list) {

               Integer code =   appVersion.getVersionCode();

               if (code != null && code >= minCode) {

                  versions += appVersion.getVersion() + ",";

               }

            }

         } 
      }

		
      if (versions.endsWith(",")) {

         versions = versions.substring(0, versions.length() - 1);

      }

	
      return versions;

   }

	
	
   /**

    * 查询能推送版本号code

    * @param versionCode

    * @param listVersion

    * @return

    */

   private String getEffectiveVersionCodes(int minCode, String type, List<String> listVersion) throws PushException{

		
      if (minCode == 0 && listVersion == null) {

         return null;

      }

		
      String versionCodes = "";

      if (listVersion == null) {

         List<AppVersionInfo> list = appVersionService.listByPlatformAndMinVersionCode(type, minCode);

         if (list != null) {

            for (AppVersionInfo appVersion : list) {

               versionCodes += appVersion.getVersionCode() + ",";

            }

         }

      } else {

         List<AppVersionInfo> list = appVersionService.listByVersions(type, listVersion);

         if (list != null) {

            for (AppVersionInfo appVersion : list) {

               Integer code =   appVersion.getVersionCode();

               if (code != null && code >= minCode) {

                  versionCodes += appVersion.getVersionCode() + ",";

               }

            }

         } 
      }

		
      if (versionCodes.endsWith(",")) {

         versionCodes = versionCodes.substring(0, versionCodes.length() - 1);

      }

		
      return versionCodes;

   }

	
}