From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
index 458d1ac..4db0951 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.SystemZnxService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class PushServiceImpl implements PushService {
@@ -54,20 +55,24 @@
@Resource
private XMPushService xmPushService;
-
@Resource
private PushRecordMapper pushRecordMapper;
-
+
@Resource
private AccountMessageMapper accountMessageMapper;
-
-
+
@Async("pushExecutor")
@Override
public void pushGoods(Long uid, String url, String title, String content) throws PushException {
String gids = url.split("id=")[1];
String gid = gids.split("&")[0];
+ if (StringUtil.isNullOrEmpty(gid))
+ throw new PushException(1, "鍟嗗搧瑙ｆ瀽澶辫触");
+ if (StringUtil.isNullOrEmpty(title))
+ throw new PushException(1, "璇峰～鍐欐帹閫佹爣棰�");
+ if (StringUtil.isNullOrEmpty(content))
+ throw new PushException(1, "璇峰～鍐欐帹閫佸唴瀹�");
PushRecord pushRecord = new PushRecord();
pushRecord.setState(1);
@@ -79,7 +84,7 @@
xmPushService.pushGoods(uid, Long.parseLong(gid), title, content);
iosPushService.pushGoods(uid, Long.parseLong(gid), title, content);
- //hwPushService.pushGoods(uid, Long.parseLong(gid), title, content);
+ // hwPushService.pushGoods(uid, Long.parseLong(gid), title, content);
pushRecordMapper.insertSelective(pushRecord);
}
@@ -87,6 +92,14 @@
@Async("pushExecutor")
@Override
public void pushUrl(Long uid, String url, String title, String content) throws PushException {
+
+ if (StringUtil.isNullOrEmpty(url))
+ throw new PushException(1, "鏃犳帹閫侀摼鎺�");
+ if (StringUtil.isNullOrEmpty(title))
+ throw new PushException(1, "鏃犳帹閫佹爣棰�");
+ if (StringUtil.isNullOrEmpty(content))
+ throw new PushException(1, "鏃犳帹閫佸唴瀹�");
+
PushRecord pushRecord = new PushRecord();
pushRecord.setState(1);
pushRecord.setType(PushController.URL);
@@ -103,9 +116,13 @@
@Async("pushExecutor")
@Override
public void pushZNX(Long uId, String title, String content) throws PushException {
+ if (StringUtil.isNullOrEmpty(title))
+ throw new PushException(1, "鏃犳帹閫佹爣棰�");
+ if (StringUtil.isNullOrEmpty(content))
+ throw new PushException(1, "鏃犳帹閫佸唴瀹�");
/* 鏃爑id , 骞挎挱 鏁版嵁鎻掑叆绯荤粺琛� */
- if (uId == null||uId==0) {
+ if (uId == null || uId == 0) {
// 鎻掑叆鏁版嵁搴擄紙绯荤粺绔欏唴淇℃暟鎹級
SystemZnx systemZnx = new SystemZnx();
systemZnx.setTitle(title);
@@ -147,5 +164,18 @@
}
}
+ @Override
+ public void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException {
+ if (StringUtil.isNullOrEmpty(title))
+ throw new PushException(1, "鏃犳帹閫佹爣棰�");
+ if (StringUtil.isNullOrEmpty(content))
+ throw new PushException(1, "鏃犳帹閫佸唴瀹�");
+ iosPushService.pushWEEX(uid, title, content, weexUrl);
+ }
+
+ @Override
+ public void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException {
+ iosPushService.pushBaiChuanUrl(uid, title, content, url);
+ }
}
--
Gitblit v1.8.0