@ -33,9 +33,6 @@ public class PushChatMessage extends CommonEntity {
@ApiModelProperty("推送方用户id")
private String userId;
@ApiModelProperty("推送用户id")
private String pushUserId;
@ApiModelProperty("消息类型")
private String type;
@ -72,6 +69,9 @@ public class PushChatMessage extends CommonEntity {
@ApiModelProperty("收到通知是否发出声音")
private String playSound;
@ApiModelProperty("文字转语音")
private String playToText;
@ApiModelProperty("在线铃声")
private String onlineRingtone;
@ -39,7 +39,7 @@ public class PushChatMessageController {
.eq(StrUtil.isNotBlank(pushChatMessage.getStatus()), PushChatMessage::getStatus, pushChatMessage.getStatus())
.like(StrUtil.isNotBlank(pushChatMessage.getTitle()), PushChatMessage::getTitle, pushChatMessage.getTitle())
.eq(PushChatMessage::getUserId, pushChatMessage.getUserId())
.eq(StrUtil.isNotBlank(pushChatMessage.getPushUserId()), PushChatMessage::getPushUserId, pushChatMessage.getPushUserId());
.eq(StrUtil.isNotBlank(pushChatMessage.getAlias()), PushChatMessage::getAlias, pushChatMessage.getAlias());
}
@GetMapping("/list")
@ -56,9 +56,9 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
@Override
public void messageSend(PushChatMessage pushChatMessage) {
if (StrUtil.isBlank(pushChatMessage.getPushUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) {
/*if (StrUtil.isBlank(pushChatMessage.getPushUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) {
throw new CheckedException("当前发送方用户ID与推送应用密钥必填!");
}*/
R<User> result = remoteUserService.selectByUserId(pushChatMessage.getPushTypeId(), SecurityConstants.FROM_IN);
if (result == null || result.getData() == null) {
throw new CheckedException("用户不存在");