From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java | 140 ++++++++++++++++++++++++++++++++++------------
1 files changed, 103 insertions(+), 37 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 b2ee013..eb1093e 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
@@ -1,6 +1,8 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
import javax.annotation.Resource;
@@ -74,29 +76,41 @@
* @throws Exception
*/
@RequestMapping(value = "pushGoodsAll_f", method = RequestMethod.POST)
- public void pushGoods(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("&");
- for (String st : sts)
- if (st.contains("id=")) {
- auctionId = st.replace("id=", "");
- }
- }
+ public void pushGoods(Long uId, String url, String title, String content, String versions, PrintWriter out) throws Exception {
+ try {
+ String auctionId = null;
+ if (!StringUtil.isNullOrEmpty(url) && url.contains("id=")) {
+ String[] sts = url.split("\\?")[1].split("&");
+ for (String st : sts)
+ if (st.contains("id=")) {
+ auctionId = st.replace("id=", "");
+ }
+ }
- if (StringUtil.isNullOrEmpty(auctionId)) {
- out.print(JsonUtil.loadFalseResult("鎻愬彇鍟嗗搧ID澶辫触"));
- return;
- }
+ if (StringUtil.isNullOrEmpty(auctionId)) {
+ out.print(JsonUtil.loadFalseResult("鎻愬彇鍟嗗搧ID澶辫触"));
+ return;
+ }
- JSONObject json = IOSPushFactory.createGoodsPush(Long.parseLong(auctionId), title, content);
- if (json.toString().getBytes().length > 256) {
- out.print(JsonUtil.loadFalseResult("鏍囬鎴栧唴瀹硅繃闀匡紝璇峰垹鍑忓悗鍐嶈瘯"));
- return;
- }
+ JSONObject json = IOSPushFactory.createGoodsPush(Long.parseLong(auctionId), title, content);
+ if (json.toString().getBytes().length > 256) {
+ out.print(JsonUtil.loadFalseResult("鏍囬鎴栧唴瀹硅繃闀匡紝璇峰垹鍑忓悗鍐嶈瘯"));
+ return;
+ }
- pushService.pushGoods(uId, url, title, content);
- out.print(JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
+ pushService.pushGoods(uId, url, title, content, listVersion);
+ out.print(JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+ } catch (PushException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
+ e.printStackTrace();
+ }
}
/**
@@ -109,7 +123,7 @@
* @throws Exception
*/
@RequestMapping(value = "pushUrlAll_f", method = RequestMethod.POST)
- public void pushUrl(String url, String title, String content, PrintWriter out) throws Exception {
+ public void pushUrl(String url, String title, String content, String versions, PrintWriter out) throws Exception {
if (StringUtil.isNullOrEmpty(url) || StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
out.print(JsonUtil.loadFalseResult("璇峰～鍐欓摼鎺ワ紝鏍囬涓庡唴瀹�"));
return;
@@ -120,8 +134,22 @@
out.print(JsonUtil.loadFalseResult("鏍囬鎴栧唴瀹硅繃闀匡紝璇峰垹鍑忓悗鍐嶈瘯"));
return;
}
- pushService.pushUrl(null, url, title, content);
- out.print(JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+
+ try {
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
+ pushService.pushUrl(null, url, title, content, listVersion);
+ out.print(JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+ } catch (PushException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
+ e.printStackTrace();
+ }
+
}
/**
@@ -135,9 +163,23 @@
* @throws Exception
*/
@RequestMapping(value = "pushFanZNX_f", method = RequestMethod.POST)
- public void pushSystemZnx(Long uId, String title, String content, PrintWriter out) throws Exception {
- pushService.pushZNX(uId, title, content);
- out.print(JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+ public void pushSystemZnx(Long uId, String title, String content, String versions, PrintWriter out) throws Exception {
+ try {
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
+ pushService.pushZNX(uId, title, content, listVersion);
+
+ out.print(JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
+ } catch (PushException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鎺ㄩ�佸け璐�"));
+ e.printStackTrace();
+ }
+
}
/**
@@ -184,7 +226,7 @@
* @throws Exception
*/
@RequestMapping(value = "newPushGoodsAll")
- public void newPushGoodsAll(String callback, Long uid, String url, String title, String content, PrintWriter out)
+ public void newPushGoodsAll(String callback, Long uid, String url, String title, String content, String versions, PrintWriter out)
throws Exception {
String auctionId = null;
@@ -208,8 +250,15 @@
}
try {
- pushService.pushGoods(uid, url, title, content);
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
+ pushService.pushGoods(uid, url, title, content, listVersion);
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();
@@ -226,7 +275,7 @@
* @throws Exception
*/
@RequestMapping(value = "newPushUrlAll")
- public void newPushUrlAll(String callback, String url, String title, String content, PrintWriter out) {
+ public void newPushUrlAll(String callback, String url, String title, String content, String versions, PrintWriter out) {
if (StringUtil.isNullOrEmpty(url) || StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欓摼鎺ワ紝鏍囬涓庡唴瀹�"));
@@ -240,9 +289,16 @@
}
try {
- pushService.pushUrl(null, url, title, content);
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
+ pushService.pushUrl(null, url, title, content, listVersion);
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();
}
@@ -258,7 +314,7 @@
* @throws Exception
*/
@RequestMapping(value = "newPushFanZNX")
- public void newPushFanZNX(String callback, String uids, String title, String content, PrintWriter out) {
+ public void newPushFanZNX(String callback, String uids, String title, String content, String versions, PrintWriter out) {
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欐爣棰樹笌鍐呭"));
@@ -271,14 +327,19 @@
if (uids != null) {
uidArray = uids.split(",");
}
-
+
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
if (uidArray == null) {
- pushService.pushZNX(null, title, content);
+ pushService.pushZNX(null, title, content, listVersion);
} 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);
+ pushService.pushZNX(Long.parseLong(str_uid), title, content, listVersion);
userSystemMsgService.addUserSystemMsg(Long.parseLong(str_uid), UserSystemMsgTypeEnum.question,
title, content, UserSystemMsg.TIME_TAG_EMERGENT, null);
@@ -304,7 +365,7 @@
* @throws Exception
*/
@RequestMapping(value = "pushBaiChuan")
- public void pushBaiChuan(String callback, String uids, String title, String content, String url, PrintWriter out) {
+ public void pushBaiChuan(String callback, String uids, String title, String content, String url, String versions, PrintWriter out) {
if (StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欐爣棰樹笌鍐呭"));
@@ -318,13 +379,18 @@
uidArray = uids.split(",");
}
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ listVersion = Arrays.asList(versions.split(","));
+ }
+
if (uidArray == null) {
- pushService.pushBaiChuanUrl(null, title, content, url);
+ pushService.pushBaiChuanUrl(null, title, content, url, listVersion);
} 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);
+ pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listVersion);
}
}
}
--
Gitblit v1.8.0