From 9ac6f0db1173b58996f7a3f6c7d57159c157235d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 10 三月 2020 19:34:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java | 124 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
index fa34d15..d47608d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
@@ -6,7 +6,6 @@
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.dto.push.PushTypeEnum;
@@ -15,13 +14,15 @@
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.exception.push.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;
+import com.yeshi.fanli.service.inter.push.OPPOPushService;
import com.yeshi.fanli.service.inter.push.PushRecordService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.push.VIVOPushService;
import com.yeshi.fanli.service.inter.push.XMPushService;
import com.yeshi.fanli.service.inter.user.SystemZnxService;
import com.yeshi.fanli.util.Constant;
@@ -55,6 +56,12 @@
@Resource
private XMPushService xmPushService;
+
+ @Resource
+ private OPPOPushService oPPOPushService;
+
+ @Resource
+ private VIVOPushService vIVOPushService;
@Resource
private PushRecordMapper pushRecordMapper;
@@ -100,6 +107,22 @@
versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
hwPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
}
+
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
+ }
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushGoods(uid, Long.parseLong(gid), title, content, versionCodeList);
+ }
+
}
PushRecord pushRecord = new PushRecord();
@@ -149,6 +172,23 @@
versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
hwPushService.pushUrl(uid, url, title, content, versionCodeList);
}
+
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushUrl(uid, url, title, content, versionCodeList);
+ }
+
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushUrl(uid, url, title, content, versionCodeList);
+ }
+
}
PushRecord pushRecord = new PushRecord();
@@ -215,6 +255,22 @@
versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
hwPushService.pushZNX(uId, title, content, versionCodeList);
}
+
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushZNX(uId, title, content, versionCodeList);
+ }
+
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushZNX(uId, title, content, versionCodeList);
+ }
}
// 鎻掑叆鎺ㄩ�佽褰�
@@ -262,6 +318,22 @@
if (listAndroid != null)
versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
hwPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
+ }
+
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
+ }
+
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushWEEX(uid, title, content, weexUrl, versionCodeList);
}
// 鎻掑叆鎺ㄩ�佽褰�
@@ -312,6 +384,22 @@
hwPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
}
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
+ }
+
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushBaiChuanUrl(uid, title, content, url, versionCodeList);
+ }
+
// 鎻掑叆鎺ㄩ�佽褰�
PushRecord pushRecord = new PushRecord();
pushRecord.setUrl(url);
@@ -357,6 +445,22 @@
if (listAndroid != null)
versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
hwPushService.pushWelfareCenter(uid, title, content, versionCodeList);
+ }
+
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushWelfareCenter(uid, title, content, versionCodeList);
+ }
+
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushWelfareCenter(uid, title, content, versionCodeList);
}
// 鎻掑叆鎺ㄩ�佽褰�
@@ -484,6 +588,22 @@
hwPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
}
+ // OPPO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ oPPOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
+ }
+
+ // VIVO鎺ㄩ��
+ if (listAndroid == null || listAndroid.size() > 0) {
+ List<Integer> versionCodeList = null;
+ if (listAndroid != null)
+ versionCodeList = appVersionService.listVersionCodeByVersions("android", listAndroid);
+ vIVOPushService.pushUserSignInNotification(uid, title, content, versionCodeList);
+ }
+
// 鎻掑叆鎺ㄩ�佽褰�
PushRecord pushRecord = new PushRecord();
pushRecord.setTitle(title);
--
Gitblit v1.8.0