Browse Source

feat: app phone login

master
wangxiang 1 year ago
parent
commit
72f57e45d8
  1. 4
      kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java
  2. 3
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/mapper/PushConcernFanMapper.java
  3. 8
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
  4. 10
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml

4
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 { @@ -88,4 +88,8 @@ public class PushChatMessage extends CommonEntity {
@TableField(exist = false)
private String messageSecret;
@ApiModelProperty("用户手机号")
@TableField(exist = false)
private String phone;
}

3
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; @@ -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<PushConcernFan> { @@ -26,4 +27,6 @@ public interface PushConcernFanMapper extends BaseMapper<PushConcernFan> {
IPage<Map<String, Object>> selectPushFriendList(@Param("page") IPage<Map<String, Object>> page, @Param("map") Map map);
List<PushConcernFan> pushFriendByPhoneList(String Phone);
}

8
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; @@ -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<PushApplicationMappe @@ -51,6 +52,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
private final IPushConcernFanTypeService iPushConcernFanTypeService;
private final IPushEnterpriseService iPushEnterpriseService;
private final IPushRingtoneService iPushRingtoneService;
private final PushConcernFanMapper pushConcernFanMapper;
@Override
public void enterpriseMessageSend(PushChatMessage pushChatMessage) {
@ -88,7 +90,11 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe @@ -88,7 +90,11 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
List<PushConcernFan> pushConcernFanList = iPushConcernFanService.list(Wrappers.<PushConcernFan>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<PushConcernFan> pushConcernFanList = pushConcernFanMapper.pushFriendByPhoneList(pushChatMessage.getPhone());
pushChatMessage.setAlias(pushConcernFanList.stream().map(PushConcernFan::getConcernUserId).collect(Collectors.joining(",")));
}
// 过滤黑名单,根据谁拉黑了推送方用户进行过滤推送用户

10
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushConcernFanMapper.xml

@ -171,4 +171,14 @@ @@ -171,4 +171,14 @@
</where>
</select>
<select id="pushFriendByPhoneList" resultType="PushConcernFan">
select * from common_push_concern_fan
<where>
del_flag = 0
and status = 2
and concern_user_id = (select id from sso_enhanced_user_view where phone = #{phone} and status = 0 and del_flag = 0 limit 1)
</where>
</select>
</mapper>

Loading…
Cancel
Save