From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 75 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java
index 0a3baac..ce8c2f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java
@@ -1,14 +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;
@@ -17,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
@@ -27,7 +48,7 @@
JSONObject json = new JSONObject();
// json.put("url", "http://item.taobao.com/item.htm?id=" + gid);// IOS浣跨敤
json.put("id", gid);
- json.put("type", "goodsdetail");
+ json.put("type", PushTypeEnum.goodsdetail.name());
json.put("miPushUrl", String.format("%s.ui.recommend.GoodsBrowserActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
@@ -55,7 +76,7 @@
} else {
info.setAlias(uid + "");
// 灏忕背 鍗曟帹
- PushUtils.singlePushXiaoMi(info, json, pushRecord);
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);
}
}
@@ -65,7 +86,7 @@
JSONObject json = new JSONObject();
json.put("url", url);
- json.put("type", "url");
+ json.put("type", PushTypeEnum.url.name());
json.put("webUrl", url);
json.put("miPushUrl", String.format("%s.ui.invite.ShareBrowserActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
@@ -95,7 +116,7 @@
}
} else {
info.setAlias(uid + "");
- PushUtils.singlePushXiaoMi(info, json, pushRecord);
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);
}
}
@@ -122,10 +143,10 @@
contentJson.put("id", id);
JSONObject json = new JSONObject();
- json.put("type", "ZNX");
+ json.put("type", PushTypeEnum.ZNX.name());
json.put("content", contentJson);
- json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",
- Constant.systemCommonConfig.getAndroidBaseactivityName()));
+ json.put("miPushUrl",
+ String.format("%s.ui.main.MainActivity", Constant.systemCommonConfig.getAndroidBaseactivityName()));
// 鐗堟湰鎺ㄩ��
if (versions != null && versions.trim().length() > 0) {
@@ -156,10 +177,10 @@
contentJson.put("id", msg.getId() + "");
JSONObject json = new JSONObject();
- json.put("type", "ZNX");
+ json.put("type", PushTypeEnum.ZNX.name());
json.put("content", contentJson);
- json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",
- Constant.systemCommonConfig.getAndroidBaseactivityName()));
+ json.put("miPushUrl",
+ String.format("%s.ui.main.MainActivity", Constant.systemCommonConfig.getAndroidBaseactivityName()));
// 鐗堟湰鎺ㄩ��
if (versions != null && versions.trim().length() > 0) {
@@ -168,7 +189,7 @@
// 灏忕背 鍗曟帹
try {
- PushUtils.singlePushXiaoMi(info, json, pushRecord);
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uId), pushRecord);
} catch (Exception e) {
PushLogHelper.xmError(e);
}
@@ -181,7 +202,7 @@
JSONObject json = new JSONObject();
json.put("url", weexUrl);
- json.put("type", "weex");
+ json.put("type", PushTypeEnum.weex.name());
// 鐗堟湰鎺ㄩ��
if (versions != null && versions.trim().length() > 0) {
@@ -208,7 +229,7 @@
}
} else {
info.setAlias(uid + "");
- PushUtils.singlePushXiaoMi(info, json, pushRecord);
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);
}
}
@@ -219,7 +240,7 @@
JSONObject json = new JSONObject();
json.put("url", url);
- json.put("type", "baichuan");
+ json.put("type", PushTypeEnum.baichuan.name());
// 鐗堟湰鎺ㄩ��
if (versions != null && versions.trim().length() > 0) {
json.put("app_version", versions);
@@ -243,7 +264,7 @@
}
} else {
info.setAlias(uid + "");
- PushUtils.singlePushXiaoMi(info, json, pushRecord);
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);
}
}
@@ -252,7 +273,7 @@
public void pushWelfareCenter(Long uid, String title, String content, String versions) throws PushException {
JSONObject json = new JSONObject();
- json.put("type", "welfare");
+ json.put("type", PushTypeEnum.welfare.name());
json.put("miPushUrl", String.format("%s.ui.mine.WelfareCenterActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
// 鐗堟湰鎺ㄩ��
@@ -280,7 +301,43 @@
}
} else {
info.setAlias(uid + "");
- PushUtils.singlePushXiaoMi(info, json, pushRecord);
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);
+ }
+ }
+
+ @Override
+ public void pushUserSignInNotification(Long uid, String title, String content, String versions)
+ throws PushException {
+ JSONObject json = new JSONObject();
+ json.put("type", PushTypeEnum.signin.name());
+ json.put("miPushUrl", String.format("%s.ui.goldtask.GoldTaskActivity",
+ Constant.systemCommonConfig.getAndroidBaseactivityName()));
+ // 鐗堟湰鎺ㄩ��
+ if (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
+
+ MessageInfo info = new MessageInfo();
+ info.setTitle(title);
+ info.setContent(content);
+ info.setDescription(content);
+ // 灏忕背鎺ㄩ�佺綉椤�
+ info.setPackageName(Constant.systemCommonConfig.getAndroidPackageName());
+ info.setActivty(String.format("%s.ui.goldtask.GoldTaskActivity",
+ Constant.systemCommonConfig.getAndroidBaseactivityName()));
+
+ PushRecord pushRecord = new PushRecord();
+
+ // 灏忕背 鍏ㄦ帹
+ if (uid == null || uid == 0) {
+ try {
+ PushUtils.allPushXiaoMi(info, json, pushRecord);
+ } catch (Exception e) {
+ PushLogHelper.xmError(e);
+ }
+ } else {
+ info.setAlias(uid + "");
+ PushUtils.singlePushXiaoMi(info, json, getRegIds(uid), pushRecord);
}
}
--
Gitblit v1.8.0