|
|
@@ -169,15 +169,14 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
mp.setMessageId(mfs.getId());
|
|
|
mp.setConsumerId(cid);
|
|
|
producerTarget.add(mp);
|
|
|
-
|
|
|
- bo = new MessageBo();
|
|
|
- bo.setMessageId(mfs.getId());
|
|
|
- bo.setMessageTitle(mfs.getTitle());
|
|
|
- bo.setMessageBody(mfs.getBody());
|
|
|
- bo.setResourceId(mfs.getResourceId());
|
|
|
- bo.setResourceType(String.valueOf(mfs.getResourceType()));
|
|
|
- bo.setRegistrationId(cid);
|
|
|
- sendTarget.add(bo);
|
|
|
+ if(messageFromSystemMapper.checkJPushAcc(cid) >0){
|
|
|
+ bo = new MessageBo();
|
|
|
+ bo.setMessageId(mfs.getId());
|
|
|
+ bo.setMessageTitle(mfs.getTitle());
|
|
|
+ bo.setMessageBody(mfs.getBody());
|
|
|
+ bo.setRegistrationId(cid);
|
|
|
+ sendTarget.add(bo);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if(producerTarget.size()>0) insertBatchProducer(producerTarget);
|
|
|
@@ -195,14 +194,14 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
mp.setConsumerId(cid);
|
|
|
producerTarget.add(mp);
|
|
|
|
|
|
- bo = new MessageBo();
|
|
|
- bo.setMessageId(mfs.getId());
|
|
|
- bo.setMessageTitle(mfs.getTitle());
|
|
|
- bo.setMessageBody(mfs.getBody());
|
|
|
- bo.setResourceId(mfs.getResourceId());
|
|
|
- bo.setResourceType(String.valueOf(mfs.getResourceType()));
|
|
|
- bo.setRegistrationId(cid);
|
|
|
- sendTarget.add(bo);
|
|
|
+ if(messageFromSystemMapper.checkJPushAcc(cid) >0){
|
|
|
+ bo = new MessageBo();
|
|
|
+ bo.setMessageId(mfs.getId());
|
|
|
+ bo.setMessageTitle(mfs.getTitle());
|
|
|
+ bo.setMessageBody(mfs.getBody());
|
|
|
+ bo.setRegistrationId(cid);
|
|
|
+ sendTarget.add(bo);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if(producerTarget.size()>0) insertBatchProducer(producerTarget);
|
|
|
@@ -260,14 +259,16 @@ public class MessageServiceImpl extends BaseMybatisDao<MessageFromSystemMapper>
|
|
|
mp.setMessageId(messageId);
|
|
|
producerTarget.add(mp);
|
|
|
|
|
|
- bo = new MessageBo();
|
|
|
- bo.setMessageId(messageId);
|
|
|
- bo.setMessageTitle(message.getTitle());
|
|
|
- bo.setMessageBody(message.getBody());
|
|
|
- bo.setResourceId(message.getResourceId());
|
|
|
- bo.setResourceType(String.valueOf(message.getResourceType()));
|
|
|
- bo.setRegistrationId(cid);
|
|
|
- sendTarget.add(bo);
|
|
|
+ if(messageFromSystemMapper.checkJPushAcc(cid) >0){
|
|
|
+ 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);
|
|
|
+ sendTarget.add(bo);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|