Browse Source

调整

master
zouhantao 3 weeks ago
parent
commit
73397b2a44

+ 15
- 12
zhywpt-app-msgw/src/main/java/cn/com/taiji/msgw/manager/importReview/MessageImportManagerImpl.java View File

@@ -157,20 +157,22 @@ public class MessageImportManagerImpl extends AbstractCommManager implements Mes
BeanUtils.copyProperties(request, apply);
ObjectMapper objectMapper = new ObjectMapper();
// app发送全体用户做过滤
if (!request.getJPushType().equals(MessageJPushType.JPUSHALLAPPN)
&& !request.getJPushType().equals(MessageJPushType.JPUSHALLAPPM)
&& !request.getJPushType().equals(MessageJPushType.JPUSHALLAPPNM)){
if (request.getReceiverIdList().size() != 0) {
String json = null;
try {
json = JsonTools.toJsonStr(request.getReceiverIdList());
} catch (IOException e) {
throw new RuntimeException(e);
if (request.getMessageType().equals(MessageType.APP)) {
if (!request.getJPushType().equals(MessageJPushType.JPUSHALLAPPN)
&& !request.getJPushType().equals(MessageJPushType.JPUSHALLAPPM)
&& !request.getJPushType().equals(MessageJPushType.JPUSHALLAPPNM)){
if (request.getReceiverIdList().size() != 0) {
String json = null;
try {
json = JsonTools.toJsonStr(request.getReceiverIdList());
} catch (IOException e) {
throw new RuntimeException(e);
}
apply.setReceiverIdList(json);
}
apply.setReceiverIdList(json);
}else {
apply.setReceiverIdList("ALL");
}
}else {
apply.setReceiverIdList("ALL");
}
apply.setStatus(AuditStatus.AUDIT);
apply.setInsertTime(LocalDateTime.now());
@@ -180,6 +182,7 @@ public class MessageImportManagerImpl extends AbstractCommManager implements Mes
} else {
apply.setSendTime(LocalDateTime.now());
}
apply.setReceiverIdList(request.getReceiverIdList().toString());
MsgwSendApply sendApply = sendApplyRepo.save(apply);
// email的存附件表
if (MessageType.EMAIL.equals(request.getMessageType()) && request.getEmailAttachmentUrl().size() != 0) {

Loading…
Cancel
Save