|
|
@ -7,11 +7,15 @@ import cn.hutool.extra.servlet.ServletUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
|
|
|
|
import com.cloud.kicc.common.core.api.R; |
|
|
|
|
|
|
|
import com.cloud.kicc.common.core.constant.SecurityConstants; |
|
|
|
import com.cloud.kicc.common.core.exception.CheckedException; |
|
|
|
import com.cloud.kicc.common.core.exception.CheckedException; |
|
|
|
import com.cloud.kicc.commonbiz.api.entity.*; |
|
|
|
import com.cloud.kicc.commonbiz.api.entity.*; |
|
|
|
import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper; |
|
|
|
import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper; |
|
|
|
import com.cloud.kicc.commonbiz.service.*; |
|
|
|
import com.cloud.kicc.commonbiz.service.*; |
|
|
|
import com.cloud.kicc.commonbiz.util.PushClientUtil; |
|
|
|
import com.cloud.kicc.commonbiz.util.PushClientUtil; |
|
|
|
|
|
|
|
import com.cloud.kicc.system.api.entity.User; |
|
|
|
|
|
|
|
import com.cloud.kicc.system.api.feign.RemoteUserService; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
import okhttp3.OkHttpClient; |
|
|
|
import okhttp3.OkHttpClient; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
@ -44,6 +48,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe |
|
|
|
private final IPushBlacklistService iPushBlacklistService; |
|
|
|
private final IPushBlacklistService iPushBlacklistService; |
|
|
|
private final IPushChatMessageService iPushChatMessageService; |
|
|
|
private final IPushChatMessageService iPushChatMessageService; |
|
|
|
private final IPushConcernFanTypeService iPushConcernFanTypeService; |
|
|
|
private final IPushConcernFanTypeService iPushConcernFanTypeService; |
|
|
|
|
|
|
|
private final RemoteUserService remoteUserService; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void enterpriseMessageSend(PushChatMessage pushChatMessage) { |
|
|
|
public void enterpriseMessageSend(PushChatMessage pushChatMessage) { |
|
|
@ -51,6 +56,13 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe |
|
|
|
if (StrUtil.isBlank(pushChatMessage.getUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) { |
|
|
|
if (StrUtil.isBlank(pushChatMessage.getUserId()) || StrUtil.isBlank(pushChatMessage.getMessageSecret())) { |
|
|
|
throw new CheckedException("当前推送方用户ID与推送应用密钥必填!"); |
|
|
|
throw new CheckedException("当前推送方用户ID与推送应用密钥必填!"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
R<User> result = remoteUserService.selectByUserId(pushChatMessage.getPushTypeId(), SecurityConstants.FROM_IN); |
|
|
|
|
|
|
|
if (result == null || result.getData() == null) { |
|
|
|
|
|
|
|
throw new CheckedException("用户不存在"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
pushChatMessage.setTenantId(result.getData().getTenantId()); |
|
|
|
|
|
|
|
|
|
|
|
PushApplication pushApplication = baseMapper.selectOne(Wrappers.<PushApplication>lambdaQuery() |
|
|
|
PushApplication pushApplication = baseMapper.selectOne(Wrappers.<PushApplication>lambdaQuery() |
|
|
|
.eq(PushApplication::getMessageSecret, pushChatMessage.getMessageSecret()) |
|
|
|
.eq(PushApplication::getMessageSecret, pushChatMessage.getMessageSecret()) |
|
|
|
.eq(PushApplication::getCreateById, pushChatMessage.getUserId()) |
|
|
|
.eq(PushApplication::getCreateById, pushChatMessage.getUserId()) |
|
|
|