|
|
|
@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.Func;
|
|
|
|
|
import org.springblade.core.tool.utils.ObjectUtil; |
|
|
|
|
import org.springblade.core.tool.utils.SpringUtil; |
|
|
|
|
import org.springblade.system.user.cache.UserCache; |
|
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
|
import org.springframework.util.Assert; |
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
@ -32,6 +33,7 @@ import javax.validation.Valid;
|
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
|
import java.time.ZoneId; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.Optional; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* @author hx |
|
|
|
@ -98,7 +100,7 @@ public class MessageClient extends BladeController implements IMessageClient{
|
|
|
|
|
entity.setPlanTime(request.getPlanTime()); |
|
|
|
|
entity.setPushType(MessageConstants.PLAN); |
|
|
|
|
entity.setPusher(request.getReceiver().toString()); |
|
|
|
|
entity.setPusherName(UserCache.getUser(request.getReceiver()).getName()); |
|
|
|
|
entity.setPusherName(Optional.ofNullable(UserCache.getUser(request.getReceiver())).map(User::getName).orElse("")); |
|
|
|
|
entity.setAccount(request.getReceiver().toString()); |
|
|
|
|
entity.setContent(request.getContent()); |
|
|
|
|
entity.setSmsParam(request.getSmsParam()); |
|
|
|
|