From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushController.java | 314 +++++++++++++++++++++++----------------------------
1 files changed, 142 insertions(+), 172 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 eb1093e..0f89c07 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,7 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -8,23 +9,16 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.JsonUtil;
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;
-import com.yeshi.fanli.service.inter.user.SystemZnxService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.factory.IOSPushFactory;
-
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -40,147 +34,13 @@
public final static int BAICHUAN = 6; // 绔欏唴鎺ㄩ��
public final static int WELFARE_CENTER = 7; // 绂忓埄涓績
- @Resource
- private PushRecordService pushRecordService;
-
- @Resource
- private ConfigService configService;
-
- @Resource
- private SystemZnxService systemZnxService;
-
- @Resource
- private AccountMessageService accountMessageService;
-
- @Resource
- private SystemService systemService;
@Resource
private PushService pushService;
@Resource
private UserSystemMsgService userSystemMsgService;
-
- /**
- * 鍟嗗搧鎺ㄩ��
- *
- * @param uId
- * -鐢ㄦ埛ID 鍙负绌�
- * @param url
- * -鍟嗗搧閾炬帴
- * @param title
- * -鎺ㄩ�佹爣棰�
- * @param content
- * -鎺ㄩ�佸唴瀹�
- * @param out
- * @throws Exception
- */
- @RequestMapping(value = "pushGoodsAll_f", method = RequestMethod.POST)
- 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;
- }
-
- JSONObject json = IOSPushFactory.createGoodsPush(Long.parseLong(auctionId), title, content);
- if (json.toString().getBytes().length > 256) {
- out.print(JsonUtil.loadFalseResult("鏍囬鎴栧唴瀹硅繃闀匡紝璇峰垹鍑忓悗鍐嶈瘯"));
- return;
- }
-
- 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();
- }
- }
-
- /**
- * 缃戦〉鎺ㄩ��
- *
- * @param url
- * @param title
- * @param content
- * @param out
- * @throws Exception
- */
- @RequestMapping(value = "pushUrlAll_f", method = RequestMethod.POST)
- 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;
- }
-
- JSONObject json = IOSPushFactory.createURLPush(HttpUtil.getShortLink(url), title, content);
- if (json.toString().getBytes().length > 256) {
- out.print(JsonUtil.loadFalseResult("鏍囬鎴栧唴瀹硅繃闀匡紝璇峰垹鍑忓悗鍐嶈瘯"));
- return;
- }
-
- 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();
- }
-
- }
-
- /**
- *
- * 鏂规硶璇存槑: 绔欏唴淇℃帹閫�
- *
- * @author mawurui createTime 2018骞�3鏈�12鏃� 涓嬪崍5:45:00
- * @param uId
- * @param title
- * @param content
- * @throws Exception
- */
- @RequestMapping(value = "pushFanZNX_f", method = RequestMethod.POST)
- 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();
- }
-
- }
+
/**
* 鐭摼鎺ヨ浆鎹�
@@ -226,7 +86,7 @@
* @throws Exception
*/
@RequestMapping(value = "newPushGoodsAll")
- public void newPushGoodsAll(String callback, Long uid, String url, String title, String content, String versions, PrintWriter out)
+ public void newPushGoodsAll(String callback, String url, String title, String content, String uids, String versions, PrintWriter out)
throws Exception {
String auctionId = null;
@@ -250,12 +110,48 @@
}
try {
- List<String> listVersion = null;
- if (versions != null && versions.trim().length() > 0) {
- listVersion = Arrays.asList(versions.split(","));
+
+ List<String> listuid = null;
+ if (uids != null && uids.trim().length() > 0) {
+ listuid = Arrays.asList(uids.split(","));
+ if (listuid == null || listuid.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛id鏍煎紡涓嶆纭�"));
+ return;
+ }
}
- pushService.pushGoods(uid, url, title, content, listVersion);
+
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ List<String> list = Arrays.asList(versions.split(","));
+
+ if (list != null && list.size() > 0) {
+ listVersion = new ArrayList<String>();
+ for (String version: list) {
+ if (version != null && version.trim().length() > 0) {
+ listVersion.add(version.trim());
+ }
+ }
+ }
+
+ if (listVersion == null || listVersion.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐗堟湰鍙锋牸寮忎笉姝ｇ‘"));
+ return;
+ }
+ }
+
+ if (listuid == null) {
+ // 鍏ㄦ帹
+ pushService.pushGoods(null, title, content, url, listVersion);
+ } else {
+ // 閮ㄥ垎鐢ㄦ埛鎺ㄩ��
+ for (String str_uid: listuid) {
+ if (str_uid != null && str_uid.trim().length() > 0) {
+ pushService.pushGoods(Long.parseLong(str_uid), url, title, content, listVersion);
+ }
+ }
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
} catch (PushException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -275,7 +171,8 @@
* @throws Exception
*/
@RequestMapping(value = "newPushUrlAll")
- public void newPushUrlAll(String callback, String url, String title, String content, String versions, PrintWriter out) {
+ public void newPushUrlAll(String callback, String url, String title, String content, String uids,
+ String versions, PrintWriter out) {
if (StringUtil.isNullOrEmpty(url) || StringUtil.isNullOrEmpty(title) || StringUtil.isNullOrEmpty(content)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇峰～鍐欓摼鎺ワ紝鏍囬涓庡唴瀹�"));
@@ -289,12 +186,47 @@
}
try {
- List<String> listVersion = null;
- if (versions != null && versions.trim().length() > 0) {
- listVersion = Arrays.asList(versions.split(","));
+
+ List<String> listuid = null;
+ if (uids != null && uids.trim().length() > 0) {
+ listuid = Arrays.asList(uids.split(","));
+ if (listuid == null || listuid.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛id鏍煎紡涓嶆纭�"));
+ return;
+ }
}
- pushService.pushUrl(null, url, title, content, listVersion);
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ List<String> list = Arrays.asList(versions.split(","));
+
+ if (list != null && list.size() > 0) {
+ listVersion = new ArrayList<String>();
+ for (String version: list) {
+ if (version != null && version.trim().length() > 0) {
+ listVersion.add(version.trim());
+ }
+ }
+ }
+
+ if (listVersion == null || listVersion.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐗堟湰鍙锋牸寮忎笉姝ｇ‘"));
+ return;
+ }
+ }
+
+ if (listuid == null) {
+ // 鍏ㄦ帹
+ pushService.pushUrl(null, title, content, url, listVersion);
+ } else {
+ // 閮ㄥ垎鎺ㄩ��
+ for (String str_uid: listuid) {
+ if (str_uid != null && str_uid.trim().length() > 0) {
+ pushService.pushUrl(Long.parseLong(str_uid), url, title, content, listVersion);
+ }
+ }
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
} catch (PushException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -323,21 +255,40 @@
try {
- String[] uidArray = null;
- if (uids != null) {
- uidArray = uids.split(",");
+ List<String> listuid = null;
+ if (uids != null && uids.trim().length() > 0) {
+ listuid = Arrays.asList(uids.split(","));
+ if (listuid == null || listuid.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛id鏍煎紡涓嶆纭�"));
+ return;
+ }
}
List<String> listVersion = null;
if (versions != null && versions.trim().length() > 0) {
- listVersion = Arrays.asList(versions.split(","));
+ List<String> list = Arrays.asList(versions.split(","));
+
+ if (list != null && list.size() > 0) {
+ listVersion = new ArrayList<String>();
+ for (String version: list) {
+ if (version != null && version.trim().length() > 0) {
+ listVersion.add(version.trim());
+ }
+ }
+ }
+
+ if (listVersion == null || listVersion.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐗堟湰鍙锋牸寮忎笉姝ｇ‘"));
+ return;
+ }
}
- if (uidArray == null) {
+ if (listuid == null) {
+ // 鍏ㄦ帹
pushService.pushZNX(null, title, content, listVersion);
} else {
- for (int i = 0; i < uidArray.length; i++) {
- String str_uid = uidArray[i];
+ // 閮ㄥ垎鎺ㄩ��
+ for (String str_uid: listuid) {
if (str_uid != null && str_uid.trim().length() > 0) {
pushService.pushZNX(Long.parseLong(str_uid), title, content, listVersion);
@@ -374,21 +325,40 @@
try {
- String[] uidArray = null;
- if (uids != null) {
- uidArray = uids.split(",");
- }
-
- List<String> listVersion = null;
- if (versions != null && versions.trim().length() > 0) {
- listVersion = Arrays.asList(versions.split(","));
+ List<String> listuid = null;
+ if (uids != null && uids.trim().length() > 0) {
+ listuid = Arrays.asList(uids.split(","));
+ if (listuid == null || listuid.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛id鏍煎紡涓嶆纭�"));
+ return;
+ }
}
- if (uidArray == null) {
+ List<String> listVersion = null;
+ if (versions != null && versions.trim().length() > 0) {
+ List<String> list = Arrays.asList(versions.split(","));
+
+ if (list != null && list.size() > 0) {
+ listVersion = new ArrayList<String>();
+ for (String version: list) {
+ if (version != null && version.trim().length() > 0) {
+ listVersion.add(version.trim());
+ }
+ }
+ }
+
+ if (listVersion == null || listVersion.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐗堟湰鍙锋牸寮忎笉姝ｇ‘"));
+ return;
+ }
+ }
+
+ if (listuid == null) {
+ // 鍏ㄦ帹
pushService.pushBaiChuanUrl(null, title, content, url, listVersion);
} else {
- for (int i = 0; i < uidArray.length; i++) {
- String str_uid = uidArray[i];
+ // 閮ㄥ垎鎺ㄩ��
+ for (String str_uid: listuid) {
if (str_uid != null && str_uid.trim().length() > 0) {
pushService.pushBaiChuanUrl(Long.parseLong(str_uid), title, content, url, listVersion);
}
--
Gitblit v1.8.0