|
|
@ -14,6 +14,7 @@ import com.cloud.kicc.common.security.util.SecurityUtils; |
|
|
|
import com.cloud.kicc.commonbiz.api.entity.*; |
|
|
|
import com.cloud.kicc.commonbiz.api.entity.*; |
|
|
|
import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum; |
|
|
|
import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum; |
|
|
|
import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper; |
|
|
|
import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper; |
|
|
|
|
|
|
|
import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper; |
|
|
|
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.enums.UserTypeEnum; |
|
|
|
import com.cloud.kicc.system.api.enums.UserTypeEnum; |
|
|
@ -51,6 +52,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe |
|
|
|
private final IPushConcernFanTypeService iPushConcernFanTypeService; |
|
|
|
private final IPushConcernFanTypeService iPushConcernFanTypeService; |
|
|
|
private final IPushEnterpriseService iPushEnterpriseService; |
|
|
|
private final IPushEnterpriseService iPushEnterpriseService; |
|
|
|
private final IPushRingtoneService iPushRingtoneService; |
|
|
|
private final IPushRingtoneService iPushRingtoneService; |
|
|
|
|
|
|
|
private final PushConcernFanMapper pushConcernFanMapper; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void enterpriseMessageSend(PushChatMessage pushChatMessage) { |
|
|
|
public void enterpriseMessageSend(PushChatMessage pushChatMessage) { |
|
|
@ -88,7 +90,11 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe |
|
|
|
List<PushConcernFan> pushConcernFanList = iPushConcernFanService.list(Wrappers.<PushConcernFan>lambdaQuery() |
|
|
|
List<PushConcernFan> pushConcernFanList = iPushConcernFanService.list(Wrappers.<PushConcernFan>lambdaQuery() |
|
|
|
.eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) |
|
|
|
.eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) |
|
|
|
.eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED.getValue())); |
|
|
|
.eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED.getValue())); |
|
|
|
pushChatMessage.setAlias(pushConcernFanList.stream().map(item -> item.getConcernUserId()).collect(Collectors.joining(","))); |
|
|
|
pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getConcernUserId).collect(Collectors.joining(","))); |
|
|
|
|
|
|
|
// 根据手机号筛选关联用户
|
|
|
|
|
|
|
|
} else if (StrUtil.isNotBlank(pushChatMessage.getPhone())) { |
|
|
|
|
|
|
|
List<PushConcernFan> pushConcernFanList = pushConcernFanMapper.pushFriendByPhoneList(pushChatMessage.getPhone()); |
|
|
|
|
|
|
|
pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getConcernUserId).collect(Collectors.joining(","))); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 过滤黑名单,根据谁拉黑了推送方用户进行过滤推送用户
|
|
|
|
// 过滤黑名单,根据谁拉黑了推送方用户进行过滤推送用户
|
|
|
|