diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java index 675db551..e085506e 100644 --- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java +++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java @@ -88,4 +88,8 @@ public class PushChatMessage extends CommonEntity { @TableField(exist = false) private String messageSecret; + @ApiModelProperty("用户手机号") + @TableField(exist = false) + private String phone; + } diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java index 619cb6cc..e882880a 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java @@ -8,6 +8,7 @@ import com.cloud.kicc.system.api.entity.User; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; +import java.util.List; import java.util.Map; /** @@ -26,4 +27,6 @@ public interface PushConcernFanMapper extends BaseMapper { IPage> selectPushFriendList(@Param("page") IPage> page, @Param("map") Map map); + List pushFriendByPhoneList(String Phone); + } 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 a4ee9575..3375217b 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 @@ -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.enums.PushAuditStatusEnum; 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.util.PushClientUtil; import com.cloud.kicc.system.api.enums.UserTypeEnum; @@ -51,6 +52,7 @@ public class PushApplicationServiceImpl extends ServiceImpl pushConcernFanList = iPushConcernFanService.list(Wrappers.lambdaQuery() .eq(PushConcernFan::getConcernUserId, pushChatMessage.getUserId()) .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 pushConcernFanList = pushConcernFanMapper.pushFriendByPhoneList(pushChatMessage.getPhone()); + pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getConcernUserId).collect(Collectors.joining(","))); } // 过滤黑名单,根据谁拉黑了推送方用户进行过滤推送用户 diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml index d7dfb21f..632c0330 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml @@ -171,4 +171,14 @@ + + +