Skip to content

W
wecloud_im_server
Commit 819498c8 by 罗长华
Options

完成用户关系接口 sdk

parent 68c7e44c
Showing with 455 additions and 3 deletions
core/src/main/java/com/wecloud/im/controller/ImClientController.java
......@@ -24,7 +24,9 @@ import com.alibaba.fastjson.JSON;
import com.wecloud.im.entity.ImApplication;
import com.wecloud.im.entity.ImClient;
import com.wecloud.im.param.ClientInfoParam;
import com.wecloud.im.param.ClientRelationVo;
import com.wecloud.im.param.GetClientInfoParam;
import com.wecloud.im.param.GetClientRelationParam;
import com.wecloud.im.param.GetOnlineStatusParam;
import com.wecloud.im.param.LogoutParam;
import com.wecloud.im.param.RegisterClientParam;
......@@ -180,5 +182,18 @@ public class ImClientController extends BaseController {
return ApiResult.ok(response);
}
/**
* 查询两个客户端之间的关系
* @Author luozh
* @Date 2022年05月12日 06:52:00
* @param
* @Return 与朋友的关系 1 陌生人 2 好友 3 被我拉黑
*/
@PostMapping("/getClientRelation")
@ApiOperation(value = "查询两个客户端之间的关系")
public ApiResult<ClientRelationVo> getClientRelation(@RequestBody GetClientRelationParam param) {
return ApiResult.ok(imClientService.getClientRelation(param));
}
}
core/src/main/java/com/wecloud/im/param/ClientRelationVo.java 0 → 100644
package com.wecloud.im.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
*
* @Author luozh
* @Date 2022年05月13日 10:48
* @Version 1.0
*/
@Getter
@Setter
public class ClientRelationVo {
@ApiModelProperty("客户端id")
private String clientId;
@ApiModelProperty("朋友客户端id")
private String friendClientId;
@ApiModelProperty("是否好友")
private Boolean friend = false;
@ApiModelProperty("是否黑名单")
private Boolean blacklist = false;
}
core/src/main/java/com/wecloud/im/service/ImClientService.java
......@@ -7,6 +7,7 @@ import java.util.List;
import com.wecloud.im.entity.ImClient;
import com.wecloud.im.param.ClientInfoParam;
import com.wecloud.im.param.ClientRelationVo;
import com.wecloud.im.param.GetClientInfoParam;
import com.wecloud.im.param.GetClientRelationParam;
import com.wecloud.im.param.ImClientPageParam;
......@@ -179,5 +180,5 @@ public interface ImClientService extends BaseService<ImClient> {
* @param param
* @Return
*/
Integer getClientRelation(GetClientRelationParam param);
ClientRelationVo getClientRelation(GetClientRelationParam param);
}
core/src/main/java/com/wecloud/im/service/impl/ImClientServiceImpl.java
......@@ -37,6 +37,7 @@ import com.wecloud.im.friend.entity.ImFriend;
import com.wecloud.im.friend.service.ImFriendService;
import com.wecloud.im.mapper.ImClientMapper;
import com.wecloud.im.param.ClientInfoParam;
import com.wecloud.im.param.ClientRelationVo;
import com.wecloud.im.param.GetClientInfoParam;
import com.wecloud.im.param.GetClientRelationParam;
import com.wecloud.im.param.ImClientPageParam;
......@@ -349,7 +350,20 @@ public class ImClientServiceImpl extends BaseServiceImpl<ImClientMapper, ImClien
}
@Override
public Integer getClientRelation(GetClientRelationParam param) {
return null;
public ClientRelationVo getClientRelation(GetClientRelationParam param) {
ClientRelationVo relationVo = new ClientRelationVo();
relationVo.setClientId(param.getClientId());
relationVo.setFriendClientId(param.getFriendClientId());
// 查询该好友与自己关系： 陌生人、好友、被拉黑名单
ImFriend imFriend = imFriendService.getByKey(param.getClientId(), param.getFriendClientId());
if (imFriend != null && FriendStateEnum.CONFORM.getCode().equals(imFriend.getState())) {
relationVo.setFriend(true);
}
// 查询是否被拉黑
if (imClientBlacklistService.isBeBlack(param.getClientId(), param.getFriendClientId())) {
relationVo.setBlacklist(true);
}
return relationVo;
}
}
im-sdk/src/main/java/com/wecloud/im/sdk/ResourcePathConstants.java
......@@ -111,5 +111,15 @@ public class ResourcePathConstants {
*/
public static final String LIST_GROUP_MEMBERS_REQUEST = "/api/group/listGroupMembers";
/**
* 群设置请求
*/
public static final String GROUP_SETTING_REQUEST = "";
/**
* 用户关系请求
*/
public static final String USER_RELATION_REQUEST = "/api/imClient/getClientRelation";
}
im-sdk/src/main/java/com/wecloud/im/sdk/WecloudIm.java
......@@ -4,10 +4,12 @@ import java.util.List;
import com.wecloud.im.sdk.model.Blacklist;
import com.wecloud.im.sdk.model.ChatRoomMember;
import com.wecloud.im.sdk.model.ClientRelation;
import com.wecloud.im.sdk.model.Conversation;
import com.wecloud.im.sdk.model.Friend;
import com.wecloud.im.sdk.model.GroupChatMessage;
import com.wecloud.im.sdk.model.GroupChatStatusMessage;
import com.wecloud.im.sdk.model.GroupSettingParam;
import com.wecloud.im.sdk.model.ImClient;
import com.wecloud.im.sdk.model.PageResult;
import com.wecloud.im.sdk.model.PrivateChatMessage;
......@@ -76,6 +78,24 @@ public interface WecloudIm {
List<Friend> getFriends(String userId);
/**
* 用户好友关系
* @Author luozh
* @Date 2022年05月13日 10:58:28
* @param
* @Return
*/
ClientRelation userRelation(String userId, String friendId);
/**
* 用户与多个好友关系
* @Author luozh
* @Date 2022年05月13日 10:58:28
* @param
* @Return
*/
List<ClientRelation> usersRelation(String userId, String friendIds);
/**
* 获取黑名单列表
* @Author luozh
* @Date 2022年05月07日 05:23:40
......@@ -230,5 +250,12 @@ public interface WecloudIm {
*/
List<String> listGroupMembers(String groupId);
/**
* 群设置
* @param param 群设置入参
* @return 设置结果
*/
Boolean groupSetting(GroupSettingParam param);
}
im-sdk/src/main/java/com/wecloud/im/sdk/WecloudImClient.java
......@@ -13,6 +13,7 @@ import com.wecloud.im.sdk.internal.WecloudImMessageOperation;
import com.wecloud.im.sdk.model.Blacklist;
import com.wecloud.im.sdk.model.ChatRoomMember;
import com.wecloud.im.sdk.model.ClientLoginRequest;
import com.wecloud.im.sdk.model.ClientRelation;
import com.wecloud.im.sdk.model.Conversation;
import com.wecloud.im.sdk.model.CreateGroupRequest;
import com.wecloud.im.sdk.model.DismissGroupRequest;
......@@ -23,6 +24,8 @@ import com.wecloud.im.sdk.model.GetUnsureFriendsRequest;
import com.wecloud.im.sdk.model.GroupChatMessage;
import com.wecloud.im.sdk.model.GroupChatStatusMessage;
import com.wecloud.im.sdk.model.GroupMembersFriendRequestRequest;
import com.wecloud.im.sdk.model.GroupSettingParam;
import com.wecloud.im.sdk.model.GroupSettingRequest;
import com.wecloud.im.sdk.model.ImClient;
import com.wecloud.im.sdk.model.JoinGroupRequest;
import com.wecloud.im.sdk.model.LeaveGroupRequest;
......@@ -43,6 +46,8 @@ import com.wecloud.im.sdk.model.SetConversationDoNotDisturbRequest;
import com.wecloud.im.sdk.model.SetConversationTopRequest;
import com.wecloud.im.sdk.model.Token;
import com.wecloud.im.sdk.model.UnsureFriend;
import com.wecloud.im.sdk.model.UserRelationRequest;
import com.wecloud.im.sdk.model.UsersRelationRequest;
/**
*
......@@ -123,6 +128,20 @@ public class WecloudImClient implements WecloudIm {
}
@Override
public ClientRelation userRelation(String userId, String friendId) {
UserRelationRequest userRelationRequest =
UserRelationRequest.builder().clientId(userId).friendClientId(friendId).build();
return imClientOperation.userRelation(userRelationRequest);
}
@Override
public List<ClientRelation> usersRelation(String userId, String friendIds) {
UsersRelationRequest userRelationRequest =
UsersRelationRequest.builder().clientId(userId).friendClientIds(friendIds).build();
return imClientOperation.usersRelation(userRelationRequest);
}
@Override
public PageResult<Blacklist> pageBlacklist(Integer pageIndex, Integer pageSize, String userId) {
PageBlacklistRequest pageBlacklistRequest =
PageBlacklistRequest.builder().pageSize(pageSize).pageIndex(pageIndex).userId(userId).build();
......@@ -242,6 +261,12 @@ public class WecloudImClient implements WecloudIm {
return wecloudImGroupOperation.listGroupMembers(listGroupMembersRequest);
}
@Override
public Boolean groupSetting(GroupSettingParam param) {
GroupSettingRequest groupSettingRequest = BeanUtil.copyProperties(param, GroupSettingRequest.class);
return wecloudImGroupOperation.groupSetting(groupSettingRequest);
}
private void initOperations() {
this.imClientOperation = new WecloudImClientOperation(apiDomain, appKey, appSecret);
this.imConversationOperation = new WecloudImConversationOperation(apiDomain, appKey, appSecret);
......
im-sdk/src/main/java/com/wecloud/im/sdk/enums/GroupChatSettingTypeEnum.java 0 → 100644
package com.wecloud.im.sdk.enums;
/**
* 群聊设置类型枚举
* @Author luozh
* @Date 2022年04月27日 11:23
* @Version 1.0
*/
public enum GroupChatSettingTypeEnum {
/**
* 1-禁止群成员互加好友
*/
FORBID_ADD_FRIEND(1, "禁止群成员互加好友"),
/**
* 3-禁止群成员发图片
*/
FORBID_SEND_PIC(2, "禁止群成员发图片"),
/**
* 4-禁止群成员发链接
*/
FORBID_SEND_LINK(3, "禁止群成员发链接"),
/**
* 4-禁言
*/
MUTED(4, "禁言"),
/**
* 5-修改群名
*/
NAME(5, "修改群名"),
/**
* 修改群头像
*/
HEAD_PORTRAIT(6, "修改群头像"),
;
GroupChatSettingTypeEnum(int code, String desc) {
this.code = code;
this.desc = desc;
}
private final Integer code;
private final String desc;
public Integer getCode() {
return null;
}
public String getDesc() {
return null;
}
}
im-sdk/src/main/java/com/wecloud/im/sdk/internal/WecloudImClientOperation.java
......@@ -13,6 +13,7 @@ import com.wecloud.im.sdk.common.RequestMessage;
import com.wecloud.im.sdk.model.Blacklist;
import com.wecloud.im.sdk.model.ChatRoomMember;
import com.wecloud.im.sdk.model.ClientLoginRequest;
import com.wecloud.im.sdk.model.ClientRelation;
import com.wecloud.im.sdk.model.Conversation;
import com.wecloud.im.sdk.model.Friend;
import com.wecloud.im.sdk.model.FriendRequestRequest;
......@@ -27,6 +28,8 @@ import com.wecloud.im.sdk.model.PageResult;
import com.wecloud.im.sdk.model.RegisterClientRequest;
import com.wecloud.im.sdk.model.Token;
import com.wecloud.im.sdk.model.UnsureFriend;
import com.wecloud.im.sdk.model.UserRelationRequest;
import com.wecloud.im.sdk.model.UsersRelationRequest;
import static com.wecloud.im.sdk.ResourcePathConstants.FRIEND_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.GET_FRIENDS;
......@@ -37,6 +40,7 @@ import static com.wecloud.im.sdk.ResourcePathConstants.LIST_CONVERSATION_REQUEST
import static com.wecloud.im.sdk.ResourcePathConstants.MODIFY_USER_URL;
import static com.wecloud.im.sdk.ResourcePathConstants.PAGE_BLACKLIST_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.REGISTER_CLIENT_URL;
import static com.wecloud.im.sdk.ResourcePathConstants.USER_RELATION_REQUEST;
import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotBlank;
import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotNull;
......@@ -280,4 +284,27 @@ public class WecloudImClientOperation extends WecloudImOperation {
}
public ClientRelation userRelation(UserRelationRequest userRelationRequest) {
String clientId = userRelationRequest.getClientId();
String friendClientId = userRelationRequest.getFriendClientId();
assertParameterNotBlank(clientId, "userId");
assertParameterNotBlank(friendClientId, "friendUserId");
Map<String, String> param = new HashMap<>();
param.put("clientId", clientId);
param.put("friendClientId", friendClientId);
// 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(USER_RELATION_REQUEST)
.setMethod(HttpMethod.POST).setParameters(param)
.setOriginalRequest(userRelationRequest).build();
Object result = doOperation(request);
ClientRelation clientRelation = JSON.parseObject(JSON.toJSONString(result), ClientRelation.class);
return clientRelation;
}
public List<ClientRelation> usersRelation(UsersRelationRequest userRelationRequest) {
return null;
}
}
im-sdk/src/main/java/com/wecloud/im/sdk/internal/WecloudImGroupOperation.java
package com.wecloud.im.sdk.internal;
import java.net.URL;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -9,18 +10,22 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.wecloud.im.sdk.common.HttpMethod;
import com.wecloud.im.sdk.common.RequestMessage;
import com.wecloud.im.sdk.enums.GroupChatSettingTypeEnum;
import com.wecloud.im.sdk.model.CreateGroupRequest;
import com.wecloud.im.sdk.model.DismissGroupRequest;
import com.wecloud.im.sdk.model.GroupSettingRequest;
import com.wecloud.im.sdk.model.JoinGroupRequest;
import com.wecloud.im.sdk.model.LeaveGroupRequest;
import com.wecloud.im.sdk.model.ListGroupMembersRequest;
import static com.wecloud.im.sdk.ResourcePathConstants.CREATE_GROUP_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.DISMISS_GROUP_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.GROUP_SETTING_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.JOIN_GROUP_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.LEAVE_GROUP_REQUEST;
import static com.wecloud.im.sdk.ResourcePathConstants.LIST_GROUP_MEMBERS_REQUEST;
import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotBlank;
import static com.wecloud.im.sdk.utils.CodingUtils.assertParameterNotNull;
/**
* 群组操作
......@@ -160,4 +165,65 @@ public class WecloudImGroupOperation extends WecloudImOperation {
}
/**
* 群设置
* @Author luozh
* @Date 2022年05月12日 05:41:21
* @param param
* @Return
*/
public Boolean groupSetting(GroupSettingRequest groupSettingRequest) {
// 参数校验
GroupChatSettingTypeEnum type = groupSettingRequest.getType();
String groupId = groupSettingRequest.getGroupId();
Boolean on = groupSettingRequest.getOn();
String name = groupSettingRequest.getName();
String headPortrait = groupSettingRequest.getHeadPortrait();
assertParameterNotBlank(groupId, "groupId");
assertParameterNotNull(type, "type");
switch (type) {
case FORBID_SEND_PIC:
case FORBID_SEND_LINK:
case FORBID_ADD_FRIEND:
case MUTED:
assertParameterNotNull(on, "on");
break;
case NAME:
assertParameterNotBlank(name, "name");
break;
case HEAD_PORTRAIT:
assertParameterNotBlank(headPortrait, "headPortrait");
break;
default:
break;
}
// 校验完成，构建参数
Map<String, String> param = new HashMap<>();
param.put("type", type.name());
param.put("groupId", groupId);
switch (type) {
case FORBID_SEND_PIC:
case FORBID_SEND_LINK:
case FORBID_ADD_FRIEND:
case MUTED:
param.put("on", on.toString());
break;
case NAME:
param.put("name", name);
break;
case HEAD_PORTRAIT:
param.put("headPortrait", headPortrait);
break;
default:
break;
}
// 发送请求
RequestMessage request = new WecloudRequestMessageBuilder().setEndpoint(GROUP_SETTING_REQUEST)
.setMethod(HttpMethod.POST).setParameters(param)
.setOriginalRequest(groupSettingRequest).build();
Object result = doOperation(request);
return JSON.parseObject(JSON.toJSONString(result), Boolean.class);
}
}
im-sdk/src/main/java/com/wecloud/im/sdk/model/ClientRelation.java 0 → 100644
package com.wecloud.im.sdk.model;
import lombok.Getter;
import lombok.Setter;
/**
*
* @Author luozh
* @Date 2022年05月13日 10:48
* @Version 1.0
*/
@Getter
@Setter
public class ClientRelation {
/**
* 客户端id
*/
private String clientId;
/**
* 朋友客户端id
*/
private String friendClientId;
/**
* 是否好友
*/
private Boolean friend;
/**
* 是否黑名单
*/
private Boolean blacklist;
}
im-sdk/src/main/java/com/wecloud/im/sdk/model/GroupSettingParam.java 0 → 100644
package com.wecloud.im.sdk.model;
import lombok.Data;
import com.wecloud.im.sdk.enums.GroupChatSettingTypeEnum;
/**
* 群聊设置入参
* @Author luozh
* @Date 2022年04月27日 11:20
* @Version 1.0
*/
@Data
public class GroupSettingParam {
/**
* 设置类型 FORBID_ADD_FRIEND 禁止群成员互加好友
* FORBID_SEND_PIC 禁止群成员发图片
* FORBID_SEND_LINK 禁止群成员发链接
* MUTED 群禁言
* NAME 修改群名
* HEAD_PORTRAIT 修改头像
*/
private GroupChatSettingTypeEnum type;
/**
* 群组id
*/
private String groupId;
/**
* 开关状态
*/
private Boolean on;
/**
* 群名称 修改群名称时传值
*/
private String name;
/**
* 头像 修改群头像时传值
*/
private String headPortrait;
}
im-sdk/src/main/java/com/wecloud/im/sdk/model/GroupSettingRequest.java 0 → 100644
package com.wecloud.im.sdk.model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import com.wecloud.im.sdk.enums.GroupChatSettingTypeEnum;
/**
* 群聊设置入参
* @Author luozh
* @Date 2022年04月27日 11:20
* @Version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class GroupSettingRequest extends WebServiceRequest {
/**
* 设置类型 FORBID_ADD_FRIEND 禁止群成员互加好友
* FORBID_SEND_PIC 禁止群成员发图片
* FORBID_SEND_LINK 禁止群成员发链接
* MUTED 群禁言
* NAME 修改群名
* HEAD_PORTRAIT 修改头像
*/
private GroupChatSettingTypeEnum type;
/**
* 群组id
*/
private String groupId;
/**
* 开关状态
*/
private Boolean on;
/**
* 群名称 修改群名称时传值
*/
private String name;
/**
* 头像 修改群头像时传值
*/
private String headPortrait;
}
im-sdk/src/main/java/com/wecloud/im/sdk/model/UserRelationRequest.java 0 → 100644
package com.wecloud.im.sdk.model;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*
* @Author luozh
* @Date 2022年05月13日 11:02
* @Version 1.0
*/
@Builder
@EqualsAndHashCode(callSuper = true)
@Data
public class UserRelationRequest extends WebServiceRequest {
/**
* 客户端id
*/
private String clientId;
/**
* 好友客户端id
*/
private String friendClientId;
}
im-sdk/src/main/java/com/wecloud/im/sdk/model/UsersRelationRequest.java 0 → 100644
package com.wecloud.im.sdk.model;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*
* @Author luozh
* @Date 2022年05月13日 11:02
* @Version 1.0
*/
@Builder
@EqualsAndHashCode(callSuper = true)
@Data
public class UsersRelationRequest extends WebServiceRequest {
/**
* 客户端id
*/
private String clientId;
/**
* 好友客户端id
*/
private String friendClientIds;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment