|
|
@ -183,7 +183,7 @@ public class MessageClient extends BladeController implements IMessageClient{ |
|
|
|
public R<Boolean> sendSmsImmediatelyMsg(@RequestBody SmsImmediatelyPushDTO smsImmediatelyPushDTO) { |
|
|
|
public R<Boolean> sendSmsImmediatelyMsg(@RequestBody SmsImmediatelyPushDTO smsImmediatelyPushDTO) { |
|
|
|
MessagePushRecordEntity record = BeanUtil.copy(smsImmediatelyPushDTO,MessagePushRecordEntity.class); |
|
|
|
MessagePushRecordEntity record = BeanUtil.copy(smsImmediatelyPushDTO,MessagePushRecordEntity.class); |
|
|
|
record.setMessageId(IdWorker.getId()); |
|
|
|
record.setMessageId(IdWorker.getId()); |
|
|
|
String pusherName = Optional.ofNullable(smsImmediatelyPushDTO.getPusher()).map(Func::toLong).map(UserCache::getUser).map(User::getName).orElse(null); |
|
|
|
String pusherName = Optional.ofNullable(smsImmediatelyPushDTO.getPusher().split(",")).map(Func::toLong).map(UserCache::getUser).map(User::getName).orElse(null); |
|
|
|
record.setPusherName(pusherName); |
|
|
|
record.setPusherName(pusherName); |
|
|
|
record.setPushType(MessageConstants.IMMEDIATELY); |
|
|
|
record.setPushType(MessageConstants.IMMEDIATELY); |
|
|
|
record.setDeptName(Func.isNotEmpty(record.getDeptName()) ? record.getDeptName() : this.getDeptNameById(record.getDeptId())); |
|
|
|
record.setDeptName(Func.isNotEmpty(record.getDeptName()) ? record.getDeptName() : this.getDeptNameById(record.getDeptId())); |
|
|
|