Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -1,15 +1,22 @@
package com.yeshi.fanli.service.impl.push;



import java.util.ArrayList;

import java.util.List;



import javax.annotation.Resource;



import org.springframework.scheduling.annotation.Async;

import org.springframework.stereotype.Service;



import com.yeshi.fanli.dto.push.PushTypeEnum;

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

import com.yeshi.fanli.entity.push.DeviceTokenXM;

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

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

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

import com.yeshi.fanli.exception.PushException;

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

import com.yeshi.fanli.log.PushLogHelper;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.push.PushUtils;

@@ -18,6 +25,19 @@


@Service

public class XMPushServiceImpl implements XMPushService {



   @Resource

   private DeviceTokenXMService deviceTokenXMService;



   private List<String> getRegIds(Long uid) {

      List<DeviceTokenXM> list = deviceTokenXMService.listByUid(uid);



      List<String> regIds = new ArrayList<>();

      if (list != null)

         for (DeviceTokenXM token : list)

            regIds.add(token.getRegisterId());

      return regIds;

   }



   @Async("pushExecutor")

   @Override

@@ -56,7 +76,7 @@
      } else {

         info.setAlias(uid + "");

         // 小米 单推

         PushUtils.singlePushXiaoMi(info, json, pushRecord);

         PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);

      }

   }



@@ -96,7 +116,7 @@
         }

      } else {

         info.setAlias(uid + "");

         PushUtils.singlePushXiaoMi(info, json, pushRecord);

         PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);

      }

   }



@@ -123,10 +143,10 @@
         contentJson.put("id", id);



         JSONObject json = new JSONObject();

         json.put("type",PushTypeEnum.ZNX.name());

         json.put("type", PushTypeEnum.ZNX.name());

         json.put("content", contentJson);

         json.put("miPushUrl", String.format("%s.ui.main.MainActivity",

               Constant.systemCommonConfig.getAndroidBaseactivityName()));

         json.put("miPushUrl",

               String.format("%s.ui.main.MainActivity", Constant.systemCommonConfig.getAndroidBaseactivityName()));



         // 版本推送

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

@@ -159,8 +179,8 @@
         JSONObject json = new JSONObject();

         json.put("type", PushTypeEnum.ZNX.name());

         json.put("content", contentJson);

         json.put("miPushUrl", String.format("%s.ui.main.MainActivity",

               Constant.systemCommonConfig.getAndroidBaseactivityName()));

         json.put("miPushUrl",

               String.format("%s.ui.main.MainActivity", Constant.systemCommonConfig.getAndroidBaseactivityName()));



         // 版本推送

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

@@ -169,7 +189,7 @@


         // 小米 单推

         try {

            PushUtils.singlePushXiaoMi(info, json, pushRecord);

            PushUtils.singlePushXiaoMi(info, json, getRegIds(uId), pushRecord);

         } catch (Exception e) {

            PushLogHelper.xmError(e);

         }

@@ -209,7 +229,7 @@
         }

      } else {

         info.setAlias(uid + "");

         PushUtils.singlePushXiaoMi(info, json, pushRecord);

         PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);

      }

   }



@@ -244,7 +264,7 @@
         }

      } else {

         info.setAlias(uid + "");

         PushUtils.singlePushXiaoMi(info, json, pushRecord);

         PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);

      }

   }



@@ -281,7 +301,7 @@
         }

      } else {

         info.setAlias(uid + "");

         PushUtils.singlePushXiaoMi(info, json, pushRecord);

         PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);

      }

   }



@@ -317,7 +337,7 @@
         }

      } else {

         info.setAlias(uid + "");

         PushUtils.singlePushXiaoMi(info, json, pushRecord);

         PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);

      }

   }