From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java | 147 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 129 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 680c6b5..e44614e 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
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.xinge.PushRecord;
import com.yeshi.fanli.exception.PushException;
import com.yeshi.fanli.log.PushLogHelper;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.push.XMPushService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.push.PushUtils;
@@ -25,9 +26,22 @@
@Resource
private AppVersionInfoMapper appVersionInfoMapper;
+
+ @Resource
+ private AppVersionService appVersionService;
@Override
- public void pushGoods(Long uid, Long auctionId, String title, String content) throws PushException {
+ public void pushGoods(Long uid, Long auctionId, String title, String content, List<String> listVersion) throws PushException {
+
+ // 鏃犳渶浣庣増鏈檺鍒�
+ int minVersionCode = 0;
+ String appVersion = null;
+ if (listVersion != null && listVersion.size() > 0) {
+ appVersion = getCanPushVersions(minVersionCode, listVersion);
+ } else if (minVersionCode > 0) {
+ appVersion = getVersionByMinVersionCode(minVersionCode);
+ }
+
String gid = auctionId + "";
JSONObject json = new JSONObject();
// json.put("url", "http://item.taobao.com/item.htm?id=" + gid);// IOS浣跨敤
@@ -35,7 +49,11 @@
json.put("type", "goodsdetail");
json.put("miPushUrl", String.format("%s.ui.recommend.GoodsBrowserActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
-
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
+
MessageInfo info = new MessageInfo();
info.setTitle(title);
info.setContent(content);
@@ -60,13 +78,27 @@
}
@Override
- public void pushUrl(Long uid, String url, String title, String content) throws PushException {
+ public void pushUrl(Long uid, String url, String title, String content, List<String> listVersion) throws PushException {
+ // 鏃犳渶浣庣増鏈檺鍒�
+ int minVersionCode = 0;
+ String appVersion = null;
+ if (listVersion != null && listVersion.size() > 0) {
+ appVersion = getCanPushVersions(minVersionCode, listVersion);
+ } else if (minVersionCode > 0) {
+ appVersion = getVersionByMinVersionCode(minVersionCode);
+ }
+
JSONObject json = new JSONObject();
json.put("url", url);
json.put("type", "url");
json.put("webUrl", url);
json.put("miPushUrl", String.format("%s.ui.invite.ShareBrowserActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
+
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
MessageInfo info = new MessageInfo();
info.setTitle(title);
@@ -94,13 +126,21 @@
}
@Override
- public void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX) throws PushException {
+ public void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, List<String> listVersion) throws PushException {
+
+ // 鏃犳渶浣庣増鏈檺鍒�
+ int minVersionCode = 0;
+ String appVersion = null;
+ if (listVersion != null && listVersion.size() > 0) {
+ appVersion = getCanPushVersions(minVersionCode, listVersion);
+ } else if (minVersionCode > 0) {
+ appVersion = getVersionByMinVersionCode(minVersionCode);
+ }
+
MessageInfo info = new MessageInfo();
-
info.setPackageName(Constant.systemCommonConfig.getAndroidPackageName());
JSONObject contentJson = new JSONObject();
-
contentJson.put("isOpen", 0);
contentJson.put("createTime", java.lang.System.currentTimeMillis());
@@ -120,7 +160,11 @@
json.put("content", contentJson);
json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
-
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
+
PushRecord pushRecord = new PushRecord();
// 灏忕背 鍏ㄦ帹
@@ -149,6 +193,12 @@
json.put("content", contentJson);
json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
+
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
+
// 灏忕背 鍗曟帹
try {
PushUtils.singlePushXiaoMi(info, json, pushRecord);
@@ -159,13 +209,25 @@
}
@Override
- public void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException {
- // TODO 鎺ㄩ�亀eex椤甸潰
+ public void pushWEEX(Long uid, String title, String content, String weexUrl, List<String> listVersion) throws PushException {
+
+ // 璁剧疆鍙帹閫佺増鏈�,1.4.8浠ュ悗鐨勭増鏈彲鎺ㄩ��
+ int minVersionCode = 31;
+ String appVersion = null;
+ if (listVersion != null && listVersion.size() > 0) {
+ appVersion = getCanPushVersions(minVersionCode, listVersion);
+ } else if (minVersionCode > 0) {
+ appVersion = getVersionByMinVersionCode(minVersionCode);
+ }
+
JSONObject json = new JSONObject();
json.put("url", weexUrl);
json.put("type", "weex");
- // 璁剧疆鍙帹閫佺増鏈�,1.4.8浠ュ悗鐨勭増鏈彲鎺ㄩ��
- json.put("app_version", getVersionByMinVersionCode(31));
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
+
MessageInfo info = new MessageInfo();
info.setTitle(title);
info.setContent(content);
@@ -204,14 +266,52 @@
return versions;
}
+
+ /**
+ * 鏌ヨ鑳芥帹閫佺増鏈彿
+ * @param versionCode
+ * @param listVersion
+ * @return
+ */
+ private String getCanPushVersions(int versionCode, List<String> listVersion) {
+ List<AppVersionInfo> list = appVersionService.listByVersions(AppVersionInfo.PLATFORM_ANDROID, listVersion);
+ String versions = "";
+
+ if (list != null) {
+ for (AppVersionInfo appVersion : list) {
+ Integer code = appVersion.getVersionCode();
+ if (code != null && code >= versionCode) {
+ versions += appVersion.getVersion() + ",";
+ }
+ }
+ }
+
+ if (versions.endsWith(",")) {
+ versions = versions.substring(0, versions.length() - 1);
+ }
+
+ return versions;
+ }
@Override
- public void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException {
+ public void pushBaiChuanUrl(Long uid, String title, String content, String url, List<String> listVersion) throws PushException {
+
+ // 璁剧疆鍙帹閫佺増鏈�,1.4.8浠ュ悗鐨勭増鏈彲鎺ㄩ��
+ int minVersionCode = 31;
+ String appVersion = null;
+ if (listVersion != null && listVersion.size() > 0) {
+ appVersion = getCanPushVersions(minVersionCode, listVersion);
+ } else if (minVersionCode > 0){
+ appVersion = getVersionByMinVersionCode(minVersionCode);
+ }
+
JSONObject json = new JSONObject();
json.put("url", url);
json.put("type", "baichuan");
- // 璁剧疆鍙帹閫佺増鏈�,1.4.8浠ュ悗鐨勭増鏈彲鎺ㄩ��
- json.put("app_version", getVersionByMinVersionCode(31));
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
MessageInfo info = new MessageInfo();
info.setTitle(title);
@@ -237,14 +337,25 @@
}
@Override
- public void pushWelfareCenter(Long uid, String title, String content) throws PushException {
+ public void pushWelfareCenter(Long uid, String title, String content, List<String> listVersion) throws PushException {
+
+ // 1.5.1涔嬪悗鐨勭増鏈彲鎺ㄩ��
+ int minVersionCode = 36;
+ String appVersion = null;
+ if (listVersion != null && listVersion.size() > 0) {
+ appVersion = getCanPushVersions(minVersionCode, listVersion);
+ } else if (minVersionCode > 0){
+ appVersion = getVersionByMinVersionCode(minVersionCode);
+ }
+
JSONObject json = new JSONObject();
json.put("type", "welfare");
json.put("miPushUrl", String.format("%s.ui.mine.WelfareCenterActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
-
- // 1.5.1涔嬪悗鐨勭増鏈彲鎺ㄩ��
- json.put("app_version", getVersionByMinVersionCode(36));
+ // 鐗堟湰鎺ㄩ��
+ if (appVersion != null && appVersion.trim().length() > 0) {
+ json.put("app_version", appVersion);
+ }
MessageInfo info = new MessageInfo();
info.setTitle(title);
--
Gitblit v1.8.0