From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 0881d0d..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;
@@ -23,6 +22,7 @@
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;
@@ -59,6 +59,9 @@
@Resource
private OPPOPushService oPPOPushService;
+
+ @Resource
+ private VIVOPushService vIVOPushService;
@Resource
private PushRecordMapper pushRecordMapper;
@@ -111,6 +114,13 @@
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);
}
}
@@ -169,6 +179,14 @@
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);
}
}
@@ -245,6 +263,14 @@
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);
+ }
}
// 鎻掑叆鎺ㄩ�佽褰�
@@ -300,6 +326,14 @@
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);
}
// 鎻掑叆鎺ㄩ�佽褰�
@@ -358,6 +392,14 @@
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);
@@ -411,6 +453,14 @@
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);
}
// 鎻掑叆鎺ㄩ�佽褰�
@@ -546,6 +596,14 @@
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