Skip to content

W
wecloud_im_server
Commit 852869e0 by Future
Options

拉黑逻辑

parent ce1ca6af
Showing with 24 additions and 19 deletions
core/src/main/java/com/wecloud/im/action/NormalChatAction.java
...@@ -265,7 +265,7 @@ public class NormalChatAction { ...@@ -265,7 +265,7 @@ public class NormalChatAction {
private boolean black(String reqId, ImClient imClientSender, List<ImConversationMembers> membersList, Channel channel) { private boolean black(String reqId, ImClient imClientSender, List<ImConversationMembers> membersList, Channel channel) {
String meClientId = imClientSender.getClientId(); String meClientId = imClientSender.getClientId();
String heClientId; String heClientId;
if(membersList.get(0).getFkClientId().equals(meClientId)) { if(membersList.get(0).getClientId().equals(meClientId)) {
heClientId = membersList.get(1).getClientId(); heClientId = membersList.get(1).getClientId();
} else { } else {
heClientId = membersList.get(0).getClientId(); heClientId = membersList.get(0).getClientId();
...@@ -289,21 +289,21 @@ public class NormalChatAction { ...@@ -289,21 +289,21 @@ public class NormalChatAction {
} }
// 是否把对方拉黑 // 是否把对方拉黑
boolean black = imClientBlacklistService.isBeBlack(meClientId, heClientId); // boolean black = imClientBlacklistService.isBeBlack(meClientId, heClientId);
if (black) { // if (black) {
log.info("你把对方拉黑了, meId={},heClientId={}", meClientId, heClientId); // log.info("你把对方拉黑了, meId={},heClientId={}", meClientId, heClientId);
// 响应发送方 // // 响应发送方
WsResponse<HashMap<String, Long>> responseModel = new WsResponse<>(); // WsResponse<HashMap<String, Long>> responseModel = new WsResponse<>();
ApiResult<Boolean> result = ApiResult.result(ApiCode.IS_TO_BLACK); // ApiResult<Boolean> result = ApiResult.result(ApiCode.IS_TO_BLACK);
responseModel.setCmd(WsResponseCmdEnum.RES.getCmdCode()); // responseModel.setCmd(WsResponseCmdEnum.RES.getCmdCode());
responseModel.setCode(result.getCode()); // responseModel.setCode(result.getCode());
responseModel.setMsg(result.getMessage()); // responseModel.setMsg(result.getMessage());
responseModel.setReqId(reqId); // responseModel.setReqId(reqId);
//
channelSender.sendMsgLocal((NioSocketChannel)channel, responseModel); // channelSender.sendMsgLocal((NioSocketChannel)channel, responseModel);
//
return true; // return true;
} // }
return false; return false;
} }
......
core/src/main/java/com/wecloud/im/controller/ImMultiMeetController.java
...@@ -5,9 +5,6 @@ import com.wecloud.im.param.AgreeToMultiMeetParam; ...@@ -5,9 +5,6 @@ import com.wecloud.im.param.AgreeToMultiMeetParam;
import com.wecloud.im.param.InviteToMultiMeetParam; import com.wecloud.im.param.InviteToMultiMeetParam;
import com.wecloud.im.param.LeaveFromMultiMeetParam; import com.wecloud.im.param.LeaveFromMultiMeetParam;
import com.wecloud.im.param.RejectToMultiMeetParam; import com.wecloud.im.param.RejectToMultiMeetParam;
import com.wecloud.im.param.rtc.JoinRtcChannelParam;
import com.wecloud.im.param.rtc.LeaveRtcChannelParam;
import com.wecloud.im.param.rtc.RejectRtcChannelParam;
import com.wecloud.multimeet.service.MultiMeetService; import com.wecloud.multimeet.service.MultiMeetService;
import io.geekidea.springbootplus.framework.common.api.ApiCode; import io.geekidea.springbootplus.framework.common.api.ApiCode;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
......
core/src/main/java/com/wecloud/im/service/impl/ImConversationServiceImpl.java
...@@ -15,6 +15,7 @@ import com.wecloud.im.entity.ImMessage; ...@@ -15,6 +15,7 @@ import com.wecloud.im.entity.ImMessage;
import com.wecloud.im.entity.ImMessageOnlineSend; import com.wecloud.im.entity.ImMessageOnlineSend;
import com.wecloud.im.enums.ChatTypeEnum; import com.wecloud.im.enums.ChatTypeEnum;
import com.wecloud.im.enums.GroupRoleEnum; import com.wecloud.im.enums.GroupRoleEnum;
import com.wecloud.im.enums.MutedEnum;
import com.wecloud.im.mapper.ImConversationMapper; import com.wecloud.im.mapper.ImConversationMapper;
import com.wecloud.im.param.ImClientSimpleDto; import com.wecloud.im.param.ImClientSimpleDto;
import com.wecloud.im.param.ListConversationMembersParam; import com.wecloud.im.param.ListConversationMembersParam;
...@@ -208,9 +209,11 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -208,9 +209,11 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
ImConversationMembers imConversationMembers = new ImConversationMembers(); ImConversationMembers imConversationMembers = new ImConversationMembers();
imConversationMembers.setId(imConversationMembersId); imConversationMembers.setId(imConversationMembersId);
imConversationMembers.setCreateTime(new Date()); imConversationMembers.setCreateTime(new Date());
imConversationMembers.setUpdateTime(new Date());
imConversationMembers.setFkAppid(createClient.getFkAppid()); imConversationMembers.setFkAppid(createClient.getFkAppid());
imConversationMembers.setFkConversationId(imConversationId); imConversationMembers.setFkConversationId(imConversationId);
imConversationMembers.setFkClientId(creator); imConversationMembers.setFkClientId(creator);
imConversationMembers.setClientId(createClient.getClientId());
imConversationMembers.setRole(GroupRoleEnum.OWNER.getCode()); imConversationMembers.setRole(GroupRoleEnum.OWNER.getCode());
imConversationMembersService.save(imConversationMembers); imConversationMembersService.save(imConversationMembers);
...@@ -222,9 +225,11 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -222,9 +225,11 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
ImConversationMembers imConversationMembers2 = new ImConversationMembers(); ImConversationMembers imConversationMembers2 = new ImConversationMembers();
imConversationMembers2.setId(SnowflakeUtil.getId()); imConversationMembers2.setId(SnowflakeUtil.getId());
imConversationMembers2.setCreateTime(new Date()); imConversationMembers2.setCreateTime(new Date());
imConversationMembers2.setUpdateTime(new Date());
imConversationMembers2.setFkAppid(createClient.getFkAppid()); imConversationMembers2.setFkAppid(createClient.getFkAppid());
imConversationMembers2.setFkConversationId(imConversationId); imConversationMembers2.setFkConversationId(imConversationId);
imConversationMembers2.setFkClientId(client2.getId()); imConversationMembers2.setFkClientId(client2.getId());
imConversationMembers2.setClientId(client2.getClientId());
imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode()); imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
imConversationMembersService.save(imConversationMembers2); imConversationMembersService.save(imConversationMembers2);
if (imConversationCreate.getClientIds().size() > 1) { if (imConversationCreate.getClientIds().size() > 1) {
...@@ -304,11 +309,14 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap ...@@ -304,11 +309,14 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
Long imConversationMembersId2 = SnowflakeUtil.getId(); Long imConversationMembersId2 = SnowflakeUtil.getId();
ImConversationMembers imConversationMembers2 = new ImConversationMembers(); ImConversationMembers imConversationMembers2 = new ImConversationMembers();
imConversationMembers2.setUpdateTime(new Date());
imConversationMembers2.setId(imConversationMembersId2); imConversationMembers2.setId(imConversationMembersId2);
imConversationMembers2.setCreateTime(new Date()); imConversationMembers2.setCreateTime(new Date());
imConversationMembers2.setFkAppid(imApplication.getId()); imConversationMembers2.setFkAppid(imApplication.getId());
imConversationMembers2.setFkConversationId(imClientToConversation.getConversationId()); imConversationMembers2.setFkConversationId(imClientToConversation.getConversationId());
imConversationMembers2.setFkClientId(clientToConversation.getId()); imConversationMembers2.setFkClientId(clientToConversation.getId());
imConversationMembers2.setClientId(clientToConversation.getClientId());
imConversationMembers2.setMuted(MutedEnum.NO.getCode());
imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode()); imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
imConversationMembersService.save(imConversationMembers2); imConversationMembersService.save(imConversationMembers2);
......
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