From c88ff8bfc667d4af060792d60fc907d3a62d87ab Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 08:58:59 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 c42889f..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,9 +266,30 @@
}
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();
}
@@ -279,7 +306,7 @@
* @throws Exception
*/
@RequestMapping(value = "pushBaiChuan")
- public void pushBaiChuan(String callback, Long uid, String title, String content, String url,
+ public void pushBaiChuan(String callback, String uids, String title, String content, String url,
PrintWriter out) {
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
@@ -288,10 +315,27 @@
}
try {
- pushService.pushBaiChuanUrl(uid, title, content, url);
+
+ 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