From 073d2e0dd261bae87d8f26092988dc176c940eaa Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:29 +0800
Subject: [PATCH] 券相关的通知消息

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java |   76 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
index b3e3a64..84a5dbc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java
@@ -8,9 +8,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
+import com.yeshi.fanli.entity.bus.msg.UserSystemMsgTypeEnum;
 import com.yeshi.fanli.exception.PushException;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
 import com.yeshi.fanli.service.inter.push.PushRecordService;
 import com.yeshi.fanli.service.inter.push.PushService;
 import com.yeshi.fanli.service.inter.user.AccountMessageService;
@@ -51,6 +54,9 @@
 
 	@Resource
 	private PushService pushService;
+	
+	@Resource
+	private UserSystemMsgService userSystemMsgService;
 
 	/**
 	 * 鍟嗗搧鎺ㄩ��
@@ -252,7 +258,7 @@
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "newPushFanZNX")
-	public void newPushFanZNX(String callback, Long uid, String title, String content, PrintWriter out) {
+	public void newPushFanZNX(String callback, String uids, String title, String content, PrintWriter out) {
 		
 		if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰~鍐欐爣棰樹笌鍐呭"));
@@ -260,13 +266,79 @@
 		}
 		
 		try {
-			pushService.pushZNX(uid, title, content);
+			
+			String[] uidArray = null;
+			if (uids != null) {
+				uidArray = uids.split(",");
+			}
+			
+			if (uidArray == null) {
+				pushService.pushZNX(null, title, content);
+			} else {
+				for (int i = 0; i < uidArray.length; i++) {
+					String str_uid = uidArray[i];
+					if (str_uid != null && str_uid.trim().length() > 0) {
+						pushService.pushZNX(Long.parseLong(str_uid), title, content);
+						
+						userSystemMsgService.addUserSystemMsg(Long.parseLong(str_uid), 
+								UserSystemMsgTypeEnum.question, title, content, 
+								UserSystemMsg.TIME_TAG_EMERGENT, null);
+					}
+				}
+			}
 			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
 		} catch (PushException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
 			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
 			e.printStackTrace();
 		}
 	}
 
 	
+	/**
+	 * 
+	 * 鏂规硶璇存槑: 鐧惧窛鎺ㄩ�� -(鏂板悗鍙�)
+	 * 
+	 * @param uId
+	 * @param title
+	 * @param content
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "pushBaiChuan")
+	public void pushBaiChuan(String callback, String uids, String title, String content, String url, 
+			PrintWriter out) {
+		
+		if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰~鍐欐爣棰樹笌鍐呭"));
+			return;
+		}
+		
+		try {
+			
+			String[] uidArray = null;
+			if (uids != null) {
+				uidArray = uids.split(",");
+			}
+			
+			if (uidArray == null) {
+				pushService.pushBaiChuanUrl(null, title, content, url);
+			} else {
+				for (int i = 0; i < uidArray.length; i++) {
+					String str_uid = uidArray[i];
+					if (str_uid != null && str_uid.trim().length() > 0) {
+						pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url);
+					}
+				}
+			}
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+			
+		} catch (PushException e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+		} catch (Exception e) {
+			JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
+			e.printStackTrace();
+		}
+	}
+	
 }

--
Gitblit v1.8.0