From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java | 43 ++++++++++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
index 596840d..95b548a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/HWPushServiceImpl.java
@@ -16,7 +16,7 @@
import com.yeshi.fanli.entity.bus.user.UserCustomSettings;
import com.yeshi.fanli.entity.bus.user.UserCustomSettings.UserSettingTypeEnum;
import com.yeshi.fanli.entity.push.DeviceTokenHW;
-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.config.AppVersionService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
@@ -105,6 +105,9 @@
}
private List<DeviceTokenHW> filterDeviceToken(List<DeviceTokenHW> hwDeviceList, int hour) {
+ // TODO 鏆傛椂涓嶅鐞嗘秷鎭厤鎵撴壈
+ if (1 > 0)
+ return hwDeviceList;
// 澶勭悊娑堟伅鍏嶆墦鎵�
if (hour >= 20 || hour < 8) {
Set<Long> uidSets = new HashSet<>();
@@ -142,10 +145,16 @@
* @param webUrl
* @param versionCodeList
*/
- private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl, Long goodsId,
- List<Integer> versionCodeList) throws PushException {
+ private void push(PushTypeEnum type, Long uid, String title, String content, String url, String webUrl,
+ Long goodsId, List<Integer> versionCodeList) throws PushException {
int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
List<Integer> newVersionList = getVersionCodeList(versionCodeList);
+ // 1.6.5鍚庡紑濮嬫帹閫�
+ for (int i = 0; i < newVersionList.size(); i++) {
+ if (newVersionList.get(i) < 47)
+ newVersionList.remove(i--);
+ }
+
if (uid == null || uid == 0) {
long deviceCount = deviceTokenHWService.countDeviceToken(newVersionList);
int page = (int) (deviceCount % 100 == 0 ? deviceCount / 100 : deviceCount / 100 + 1);
@@ -157,27 +166,27 @@
for (DeviceTokenHW token : hwDeviceList)
tokenList.add(token.getDeviceToken());
try {
- if (type==PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
+ if (type == PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
if (goodsId == null)
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);
- } else if (type==PushTypeEnum.url) {// 閾炬帴
+ } else if (type == PushTypeEnum.url) {// 閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.ZNX) {// 绔欏唴淇�
+ } else if (type == PushTypeEnum.ZNX) {// 绔欏唴淇�
HWPushUtil.pushZNX(tokenList, title, content);
- } else if (type==PushTypeEnum.weex) {// weex
+ } else if (type == PushTypeEnum.weex) {// weex
if (StringUtil.isNullOrEmpty(url))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushWEEX(tokenList, title, content, url);
- } else if (type==PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
+ } else if (type == PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.welfare) {// 绂忓埄涓績
+ } else if (type == PushTypeEnum.welfare) {// 绂忓埄涓績
HWPushUtil.pushWelfareCenter(tokenList, title, content);
- }else if (type==PushTypeEnum.signin) {// 绛惧埌
+ } else if (type == PushTypeEnum.signin) {// 绛惧埌
HWPushUtil.pushUserSignInNotification(tokenList, title, content);
}
} catch (Exception e) {
@@ -198,27 +207,27 @@
return;
try {
- if (type==PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
+ if (type == PushTypeEnum.goodsdetail) {// 鍟嗗搧璇︽儏
if (goodsId == null)
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushGoods(tokenList, title, content, 1, goodsId);
- } else if (type==PushTypeEnum.url) {// 閾炬帴
+ } else if (type == PushTypeEnum.url) {// 閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.ZNX) {// 绔欏唴淇�
+ } else if (type == PushTypeEnum.ZNX) {// 绔欏唴淇�
HWPushUtil.pushZNX(tokenList, title, content);
- } else if (type==PushTypeEnum.weex) {// weex
+ } else if (type == PushTypeEnum.weex) {// weex
if (StringUtil.isNullOrEmpty(url))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushWEEX(tokenList, title, content, url);
- } else if (type==PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
+ } else if (type == PushTypeEnum.baichuan) {// 鐧惧窛閾炬帴
if (StringUtil.isNullOrEmpty(webUrl))
throw new PushException(2, "鍙傛暟涓嶅畬鏁�");
HWPushUtil.pushBaiChuanUrl(tokenList, title, content, webUrl);
- } else if (type==PushTypeEnum.welfare) {// 绂忓埄涓績
+ } else if (type == PushTypeEnum.welfare) {// 绂忓埄涓績
HWPushUtil.pushWelfareCenter(tokenList, title, content);
- } else if (type==PushTypeEnum.signin) {// 绛惧埌
+ } else if (type == PushTypeEnum.signin) {// 绛惧埌
HWPushUtil.pushUserSignInNotification(tokenList, title, content);
}
} catch (Exception e) {
--
Gitblit v1.8.0