From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/XMPushServiceImpl.java | 100 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 43 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..1dc1acb 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,13 +1,8 @@
package com.yeshi.fanli.service.impl.push;
-import java.util.List;
-
-import javax.annotation.Resource;
-
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import com.yeshi.fanli.dao.mybatis.AppVersionInfoMapper;
-import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.system.SystemZnx;
import com.yeshi.fanli.entity.xinge.MessageInfo;
@@ -23,11 +18,10 @@
@Service
public class XMPushServiceImpl implements XMPushService {
- @Resource
- private AppVersionInfoMapper appVersionInfoMapper;
-
+ @Async("pushExecutor")
@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, String versions) throws PushException {
+
String gid = auctionId + "";
JSONObject json = new JSONObject();
// json.put("url", "http://item.taobao.com/item.htm?id=" + gid);// IOS浣跨敤
@@ -35,7 +29,12 @@
json.put("type", "goodsdetail");
json.put("miPushUrl", String.format("%s.ui.recommend.GoodsBrowserActivity",
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);
@@ -59,14 +58,21 @@
}
}
+ @Async("pushExecutor")
@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, String versions) throws PushException {
+
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 (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
MessageInfo info = new MessageInfo();
info.setTitle(title);
@@ -90,17 +96,16 @@
info.setAlias(uid + "");
PushUtils.singlePushXiaoMi(info, json, pushRecord);
}
-
}
+ @Async("pushExecutor")
@Override
- public void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX) throws PushException {
+ public void pushZNX(Long uId, AccountMessage msg, SystemZnx systemZNX, String versions) throws PushException {
+
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 +125,12 @@
json.put("content", contentJson);
json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
-
+
+ // 鐗堟湰鎺ㄩ��
+ if (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
+
PushRecord pushRecord = new PushRecord();
// 灏忕背 鍏ㄦ帹
@@ -149,6 +159,12 @@
json.put("content", contentJson);
json.put("miPushUrl", String.format("%s.ui.mine.AppMailDetailActivity",
Constant.systemCommonConfig.getAndroidBaseactivityName()));
+
+ // 鐗堟湰鎺ㄩ��
+ if (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
+
// 灏忕背 鍗曟帹
try {
PushUtils.singlePushXiaoMi(info, json, pushRecord);
@@ -158,14 +174,19 @@
}
}
+ @Async("pushExecutor")
@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, String versions) throws PushException {
+
JSONObject json = new JSONObject();
json.put("url", weexUrl);
json.put("type", "weex");
- // 璁剧疆鍙帹閫佺増鏈�,1.4.8浠ュ悗鐨勭増鏈彲鎺ㄩ��
- json.put("app_version", getVersionByMinVersionCode(31));
+
+ // 鐗堟湰鎺ㄩ��
+ if (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
+
MessageInfo info = new MessageInfo();
info.setTitle(title);
info.setContent(content);
@@ -190,28 +211,19 @@
}
}
- private String getVersionByMinVersionCode(int versionCode) {
- List<AppVersionInfo> list = appVersionInfoMapper
- .listByPlatformAndMinVersionCode(AppVersionInfo.PLATFORM_ANDROID, versionCode);
- String versions = "";
- if (list != null)
- for (AppVersionInfo appVersion : list) {
- versions += appVersion.getVersion() + ",";
- }
- if (versions.endsWith(","))
- versions = versions.substring(0, versions.length() - 1);
-
- return versions;
- }
-
+ @Async("pushExecutor")
@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, String versions) throws PushException {
+
JSONObject json = new JSONObject();
json.put("url", url);
json.put("type", "baichuan");
- // 璁剧疆鍙帹閫佺増鏈�,1.4.8浠ュ悗鐨勭増鏈彲鎺ㄩ��
- json.put("app_version", getVersionByMinVersionCode(31));
+ // 鐗堟湰鎺ㄩ��
+ if (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
+
MessageInfo info = new MessageInfo();
info.setTitle(title);
@@ -233,18 +245,20 @@
info.setAlias(uid + "");
PushUtils.singlePushXiaoMi(info, json, pushRecord);
}
-
}
+ @Async("pushExecutor")
@Override
- public void pushWelfareCenter(Long uid, String title, String content) throws PushException {
+ public void pushWelfareCenter(Long uid, String title, String content, String versions) throws PushException {
+
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 (versions != null && versions.trim().length() > 0) {
+ json.put("app_version", versions);
+ }
MessageInfo info = new MessageInfo();
info.setTitle(title);
--
Gitblit v1.8.0