From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 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 23ad364..d9f381a 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
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.HttpUtil;
@@ -16,7 +17,7 @@
import com.google.gson.reflect.TypeToken;
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.exception.push.PushException;
import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.util.StringUtil;
@@ -27,15 +28,6 @@
@Controller(value = "adminPushController")
@RequestMapping("admin/new/api/v1/push")
public class PushController {
-
- public final static int GOODS = 1; // 鍟嗗搧鎺ㄩ��
- public final static int URL = 2; // 缃戦〉鎺ㄩ��
- public final static int DETAIL = 3; // 璇︽儏鎺ㄩ��
- public final static int ZNX = 4; // 绔欏唴鎺ㄩ��
- public final static int WEEX = 5; // 绔欏唴鎺ㄩ��
- public final static int BAICHUAN = 6; // 绔欏唴鎺ㄩ��
- public final static int WELFARE_CENTER = 7; // 绂忓埄涓績
-
@Resource
private PushService pushService;
@@ -52,7 +44,7 @@
* @throws Exception
*/
@RequestMapping(value = "convertLink")
- public void convertLink(String callback, String url, PrintWriter out) {
+ public void convertLink(AdminAcceptData acceptData,String callback, String url, PrintWriter out) {
if (StringUtil.isNullOrEmpty(url)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("杞摼鏁版嵁涓嶈兘涓虹┖"));
@@ -84,8 +76,8 @@
* @throws Exception
*/
@RequestMapping(value = "newPushUrlAll")
- public void newPushUrlAll(String callback, String url, String title, String content, String uids,
- String arrayIOS, String arrayAndroid, PrintWriter out) {
+ public void newPushUrlAll(AdminAcceptData acceptData, String callback, String url, String title, String content, String uids,
+ String arrayIOS, String arrayAndroid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(url) || StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欓摼鎺ワ紝鏍囬涓庡唴瀹�"));
@@ -120,12 +112,12 @@
if (listuid == null) {
// 鍏ㄦ帹
- pushService.pushUrl(null, title, content, url, listIOS, listAndroid);
+ pushService.pushUrl(null, title, content, url, listIOS, listAndroid,acceptData.getSystem());
} else {
// 閮ㄥ垎鎺ㄩ��
for (String str_uid: listuid) {
if (str_uid != null && str_uid.trim().length() > 0) {
- pushService.pushUrl(Long.parseLong(str_uid), url, title, content, listIOS, listAndroid);
+ pushService.pushUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid,acceptData.getSystem());
}
}
}
@@ -143,13 +135,12 @@
*
* 鏂规硶璇存槑: 绔欏唴淇℃帹閫� -(鏂板悗鍙�)
*
- * @param uId
* @param title
* @param content
* @throws Exception
*/
@RequestMapping(value = "newPushFanZNX")
- public void newPushFanZNX(String callback, String uids, String title, String content, String arrayIOS,
+ public void newPushFanZNX(AdminAcceptData acceptData,String callback, String uids, String title, String content, String arrayIOS,
String arrayAndroid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
@@ -180,12 +171,12 @@
if (listuid == null) {
// 鍏ㄦ帹
- pushService.pushZNX(null, title, content, listIOS, listAndroid);
+ pushService.pushZNX(null, title, content, listIOS, listAndroid,acceptData.getSystem());
} else {
// 閮ㄥ垎鎺ㄩ��
for (String str_uid: listuid) {
if (str_uid != null && str_uid.trim().length() > 0) {
- pushService.pushZNX(Long.parseLong(str_uid), title, content, listIOS, listAndroid);
+ pushService.pushZNX(Long.parseLong(str_uid), title, content, listIOS, listAndroid,acceptData.getSystem());
userSystemMsgService.addUserSystemMsg(Long.parseLong(str_uid), UserSystemMsgTypeEnum.question,
title, content, UserSystemMsg.TIME_TAG_EMERGENT, null);
@@ -205,13 +196,12 @@
*
* 鏂规硶璇存槑: 鐧惧窛鎺ㄩ�� -(鏂板悗鍙�)
*
- * @param uId
* @param title
* @param content
* @throws Exception
*/
@RequestMapping(value = "pushBaiChuan")
- public void pushBaiChuan(String callback, String uids, String title, String content, String url, String arrayIOS,
+ public void pushBaiChuan(AdminAcceptData acceptData,String callback, String uids, String title, String content, String url, String arrayIOS,
String arrayAndroid, PrintWriter out) {
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
@@ -241,12 +231,12 @@
if (listuid == null) {
// 鍏ㄦ帹
- pushService.pushBaiChuanUrl(null, title, content, url, listIOS, listAndroid);
+ pushService.pushBaiChuanUrl(null, title, content, url, listIOS, listAndroid,acceptData.getSystem());
} else {
// 閮ㄥ垎鎺ㄩ��
for (String str_uid: listuid) {
if (str_uid != null && str_uid.trim().length() > 0) {
- pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid);
+ pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listIOS, listAndroid,acceptData.getSystem());
}
}
}
--
Gitblit v1.8.0