|
|
@@ -163,18 +163,20 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
cids = tmp.split(",");
|
|
|
MessageProducer mp;
|
|
|
MessageBo bo;
|
|
|
+ String registrationId = "";
|
|
|
for(String cid : cids){
|
|
|
mp = new MessageProducer();
|
|
|
mp.setId(UUID.randomUUID().toString());
|
|
|
mp.setMessageId(mfs.getId());
|
|
|
mp.setConsumerId(cid);
|
|
|
producerTarget.add(mp);
|
|
|
- if(messageFromSystemMapper.checkJPushAcc(cid) >0){
|
|
|
+ registrationId = messageFromSystemMapper.checkJPushAcc(cid);
|
|
|
+ if(StringUtils.isNotBlank(registrationId)){
|
|
|
bo = new MessageBo();
|
|
|
bo.setMessageId(mfs.getId());
|
|
|
bo.setMessageTitle(mfs.getTitle());
|
|
|
bo.setMessageBody(mfs.getBody());
|
|
|
- bo.setRegistrationId(cid);
|
|
|
+ bo.setRegistrationId(registrationId);
|
|
|
sendTarget.add(bo);
|
|
|
}
|
|
|
}
|
|
|
@@ -187,19 +189,20 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
cids = tmp.split(",");
|
|
|
MessageProducer mp;
|
|
|
MessageBo bo;
|
|
|
+ String registrationId = "";
|
|
|
for(String cid : cids){
|
|
|
mp = new MessageProducer();
|
|
|
mp.setId(UUID.randomUUID().toString());
|
|
|
mp.setMessageId(mfs.getId());
|
|
|
mp.setConsumerId(cid);
|
|
|
producerTarget.add(mp);
|
|
|
-
|
|
|
- if(messageFromSystemMapper.checkJPushAcc(cid) >0){
|
|
|
+ registrationId = messageFromSystemMapper.checkJPushAcc(cid);
|
|
|
+ if(StringUtils.isNotBlank(registrationId)){
|
|
|
bo = new MessageBo();
|
|
|
bo.setMessageId(mfs.getId());
|
|
|
bo.setMessageTitle(mfs.getTitle());
|
|
|
bo.setMessageBody(mfs.getBody());
|
|
|
- bo.setRegistrationId(cid);
|
|
|
+ bo.setRegistrationId(registrationId);
|
|
|
sendTarget.add(bo);
|
|
|
}
|
|
|
}
|
|
|
@@ -250,7 +253,7 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
String[] cids = null;
|
|
|
if(tmp != null){
|
|
|
cids = tmp.split(",");
|
|
|
- System.out.println("cids=="+cids);
|
|
|
+ String registrationId = "";
|
|
|
for(String cid : cids){
|
|
|
mp = new MessageProducer();
|
|
|
mp.setId(UUID.randomUUID().toString());
|
|
|
@@ -258,15 +261,15 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
mp.setCreateTime(createTime);
|
|
|
mp.setMessageId(messageId);
|
|
|
producerTarget.add(mp);
|
|
|
-
|
|
|
- if(messageFromSystemMapper.checkJPushAcc(cid) >0){
|
|
|
+ registrationId = messageFromSystemMapper.checkJPushAcc(cid);
|
|
|
+ if(StringUtils.isNotBlank(registrationId)){
|
|
|
bo = new MessageBo();
|
|
|
bo.setMessageId(message.getId());
|
|
|
bo.setMessageTitle(message.getTitle());
|
|
|
bo.setMessageBody(message.getBody());
|
|
|
bo.setResourceId(message.getResourceId());
|
|
|
bo.setResourceType(String.valueOf(message.getResourceType()));
|
|
|
- bo.setRegistrationId(cid);
|
|
|
+ bo.setRegistrationId(registrationId);
|
|
|
sendTarget.add(bo);
|
|
|
}
|
|
|
}
|