From a6673284d4ec0b7c11079c65d940c9443d86d11e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:48 +0800
Subject: [PATCH] 冲突
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java | 87 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 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 c42889f..b2ee013 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;
@@ -33,6 +36,7 @@
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 PushRecordService pushRecordService;
@@ -51,6 +55,9 @@
@Resource
private PushService pushService;
+
+ @Resource
+ private UserSystemMsgService userSystemMsgService;
/**
* 鍟嗗搧鎺ㄩ��
@@ -147,7 +154,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("杞摼鏁版嵁涓嶈兘涓虹┖"));
return;
}
-
+
try {
String shortLink = org.yeshi.utils.HttpUtil.getShortLink(url);
@@ -155,17 +162,15 @@
jsonData.put("url", url);
jsonData.put("shortLink", shortLink);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(jsonData));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("杞崲澶辫触"));
e.printStackTrace();
}
}
-
-
/**
- * 鍟嗗搧鎺ㄩ�� -(鏂板悗鍙�)
+ * 鍟嗗搧鎺ㄩ�� -(鏂板悗鍙�)
*
* @param uId
* -鐢ㄦ埛ID 鍙负绌�
@@ -179,8 +184,9 @@
* @throws Exception
*/
@RequestMapping(value = "newPushGoodsAll")
- public void newPushGoodsAll(String callback, Long uid, String url, String title, String content, PrintWriter out) throws Exception {
-
+ public void newPushGoodsAll(String callback, Long uid, String url, String title, String content, PrintWriter out)
+ throws Exception {
+
String auctionId = null;
if (!StringUtil.isNullOrEmpty(url) && url.contains("id=")) {
String[] sts = url.split("\\?")[1].split("&");
@@ -209,7 +215,7 @@
e.printStackTrace();
}
}
-
+
/**
* 缃戦〉鎺ㄩ�� -(鏂板悗鍙�)
*
@@ -221,7 +227,7 @@
*/
@RequestMapping(value = "newPushUrlAll")
public void newPushUrlAll(String callback, String url, String title, String content, PrintWriter out) {
-
+
if (StringUtil.isNullOrEmpty(url) || StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欓摼鎺ワ紝鏍囬涓庡唴瀹�"));
return;
@@ -232,7 +238,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏍囬鎴栧唴瀹硅繃闀匡紝璇峰垹鍑忓悗鍐嶈瘯"));
return;
}
-
+
try {
pushService.pushUrl(null, url, title, content);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
@@ -241,7 +247,7 @@
e.printStackTrace();
}
}
-
+
/**
*
* 鏂规硶璇存槑: 绔欏唴淇℃帹閫� -(鏂板悗鍙�)
@@ -252,23 +258,42 @@
* @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("璇峰～鍐欐爣棰樹笌鍐呭"));
return;
}
-
+
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,22 +304,38 @@
* @throws Exception
*/
@RequestMapping(value = "pushBaiChuan")
- public void pushBaiChuan(String callback, Long uid, String title, String content, String url,
- PrintWriter out) {
-
+ 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 {
- 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