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 |  156 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 143 insertions(+), 13 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 068c769..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,5 +1,6 @@
 package com.yeshi.fanli.service.impl.push;
 
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.entity.bus.user.AccountMessage;
@@ -17,8 +18,10 @@
 @Service
 public class XMPushServiceImpl implements XMPushService {
 
+	@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浣跨敤
@@ -26,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);
@@ -50,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);
@@ -81,22 +96,16 @@
 			info.setAlias(uid + "");
 			PushUtils.singlePushXiaoMi(info, json, pushRecord);
 		}
-
 	}
 
+	@Async("pushExecutor")
 	@Override
-	public void pushWEEXUrl(Long uid, String weexUrl, String title, String content) throws PushException {
-
-	}
-
-	@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());
 
@@ -116,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();
 
 			// 灏忕背 鍏ㄦ帹
@@ -145,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);
@@ -154,4 +174,114 @@
 		}
 	}
 
+	@Async("pushExecutor")
+	@Override
+	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");
+		
+		// 鐗堟湰鎺ㄩ��
+		if (versions != null && versions.trim().length() > 0) {
+			json.put("app_version", versions);
+		}
+		
+		MessageInfo info = new MessageInfo();
+		info.setTitle(title);
+		info.setContent(content);
+		info.setDescription(content);
+		// 灏忕背鎺ㄩ�佺綉椤�
+		info.setPackageName(Constant.systemCommonConfig.getAndroidPackageName());
+		info.setActivty(String.format("%s.ui.mine.weex.WeexApplicationActivity",
+				Constant.systemCommonConfig.getAndroidBaseactivityName()));
+
+		PushRecord pushRecord = new PushRecord();
+
+		// 灏忕背 鍏ㄦ帹
+		if (uid == null || uid == 0) {
+			try {
+				PushUtils.allPushXiaoMi(info, json, pushRecord);
+			} catch (Exception e) {
+				PushLogHelper.xmError(e);
+			}
+		} else {
+			info.setAlias(uid + "");
+			PushUtils.singlePushXiaoMi(info, json, pushRecord);
+		}
+	}
+
+
+	@Async("pushExecutor")
+	@Override
+	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");
+		// 鐗堟湰鎺ㄩ��
+		if (versions != null && versions.trim().length() > 0) {
+			json.put("app_version", versions);
+		}
+		
+
+		MessageInfo info = new MessageInfo();
+		info.setTitle(title);
+		info.setContent(content);
+		info.setDescription(content);
+		// 灏忕背鎺ㄩ�佺綉椤�
+		info.setPackageName(Constant.systemCommonConfig.getAndroidPackageName());
+
+		PushRecord pushRecord = new PushRecord();
+
+		// 灏忕背 鍏ㄦ帹
+		if (uid == null || uid == 0) {
+			try {
+				PushUtils.allPushXiaoMi(info, json, pushRecord);
+			} catch (Exception e) {
+				PushLogHelper.xmError(e);
+			}
+		} else {
+			info.setAlias(uid + "");
+			PushUtils.singlePushXiaoMi(info, json, pushRecord);
+		}
+	}
+
+	@Async("pushExecutor")
+	@Override
+	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()));
+		// 鐗堟湰鎺ㄩ��
+		if (versions != null && versions.trim().length() > 0) {
+			json.put("app_version", versions);
+		}
+
+		MessageInfo info = new MessageInfo();
+		info.setTitle(title);
+		info.setContent(content);
+		info.setDescription(content);
+		// 灏忕背鎺ㄩ�佺綉椤�
+		info.setPackageName(Constant.systemCommonConfig.getAndroidPackageName());
+		info.setActivty(String.format("%s.ui.mine.WelfareCenterActivity",
+				Constant.systemCommonConfig.getAndroidBaseactivityName()));
+
+		PushRecord pushRecord = new PushRecord();
+
+		// 灏忕背 鍏ㄦ帹
+		if (uid == null || uid == 0) {
+			try {
+				PushUtils.allPushXiaoMi(info, json, pushRecord);
+			} catch (Exception e) {
+				PushLogHelper.xmError(e);
+			}
+		} else {
+			info.setAlias(uid + "");
+			PushUtils.singlePushXiaoMi(info, json, pushRecord);
+		}
+	}
+
 }

--
Gitblit v1.8.0