From b1c1306ff301c22c0dc004a544488dbf48a988a7 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sun, 23 Apr 2023 14:19:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=B2=89=E4=B8=9D=E5=85=B3=E8=81=94=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PushApplicationServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java index 0bb64e8f..1d37f7db 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java @@ -83,28 +83,30 @@ public class PushApplicationServiceImpl extends ServiceImpl new CheckedException("你当前没有权限发送消息，请联系管理员!")); + pushApplication = Optional.of(pushApplication).orElseThrow(() -> new CheckedException("你当前没有权限推送消息，请先创建推送应用后在试!")); HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); // 如果ip地址存在即验证发送方ip if (StrUtil.isNotBlank(pushApplication.getIgnoreIp()) && !StrUtil.contains(pushApplication.getIgnoreIp(), ServletUtil.getClientIP(request))) { - throw new CheckedException("你的ip地址不正确，请检查消息应用中设置的ip地址!"); + throw new CheckedException("你的ip地址不正确，请检查推送应用中设置的ip地址!"); } // 配置推送用户 if (StrUtil.isBlank(pushChatMessage.getAlias())) { - List pushConcernFanList = iPushConcernFanService.list(Wrappers.lambdaQuery().eq(PushConcernFan::getFanUserId, pushChatMessage.getUserId())); + List pushConcernFanList = iPushConcernFanService.list(Wrappers.lambdaQuery() + .eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) + .eq(PushConcernFan::getStatus, PushAuditStatusEnum.APPROVED)); pushChatMessage.setAlias(pushConcernFanList.stream().map(item -> item.getConcernUserId()).collect(Collectors.joining())); } // 过滤掉黑名单用户 - List pushBlacklists = iPushBlacklistService.list(Wrappers.lambdaQuery().eq(PushBlacklist::getFanUserId, pushChatMessage.getUserId())); + List pushBlacklists = iPushBlacklistService.list(Wrappers.lambdaQuery().eq(PushBlacklist::getConcernUserId, pushChatMessage.getUserId())); pushBlacklists.forEach(item -> pushChatMessage.setAlias(pushChatMessage.getAlias().replaceAll(item.getConcernUserId() + ",|$", ""))); - // 查询推送用户设置的推送类型,如果参数中没有指定则采用默认的推送类型 + // 查询粉丝设置的推送类型,如果参数中没有指定则采用默认的推送类型 List pushConcernFanTypeList = iPushConcernFanTypeService.list(Wrappers.lambdaQuery() - .eq(PushConcernFanType::getFanUserId, pushChatMessage.getUserId()) + .eq(PushConcernFanType::getConcernFanId, pushChatMessage.getUserId()) .eq(StrUtil.isNotBlank(pushChatMessage.getPushTypeId()), PushConcernFanType::getTypeId, pushChatMessage.getPushTypeId()) .eq(StrUtil.isBlank(pushChatMessage.getPushTypeId()), PushConcernFanType::getDefaultType, "1"));