拉黑逻辑

core/src/main/java/com/wecloud/im/action/NormalChatAction.java

@@ -265,7 +265,7 @@ public class NormalChatAction {
     private boolean black(String reqId, ImClient imClientSender, List<ImConversationMembers> membersList, Channel channel) {
         String meClientId = imClientSender.getClientId();
         String heClientId;
-        if(membersList.get(0).getFkClientId().equals(meClientId)) {
+        if(membersList.get(0).getClientId().equals(meClientId)) {
             heClientId = membersList.get(1).getClientId();
         } else {
             heClientId = membersList.get(0).getClientId();
@@ -289,21 +289,21 @@ public class NormalChatAction {
         }
 
         // 是否把对方拉黑
-        boolean black = imClientBlacklistService.isBeBlack(meClientId, heClientId);
-        if (black) {
-            log.info("你把对方拉黑了, meId={},heClientId={}", meClientId, heClientId);
-            // 响应发送方
-            WsResponse<HashMap<String, Long>> responseModel = new WsResponse<>();
-            ApiResult<Boolean> result = ApiResult.result(ApiCode.IS_TO_BLACK);
-            responseModel.setCmd(WsResponseCmdEnum.RES.getCmdCode());
-            responseModel.setCode(result.getCode());
-            responseModel.setMsg(result.getMessage());
-            responseModel.setReqId(reqId);
-
-            channelSender.sendMsgLocal((NioSocketChannel)channel, responseModel);
-
-            return true;
-        }
+//        boolean black = imClientBlacklistService.isBeBlack(meClientId, heClientId);
+//        if (black) {
+//            log.info("你把对方拉黑了, meId={},heClientId={}", meClientId, heClientId);
+//            // 响应发送方
+//            WsResponse<HashMap<String, Long>> responseModel = new WsResponse<>();
+//            ApiResult<Boolean> result = ApiResult.result(ApiCode.IS_TO_BLACK);
+//            responseModel.setCmd(WsResponseCmdEnum.RES.getCmdCode());
+//            responseModel.setCode(result.getCode());
+//            responseModel.setMsg(result.getMessage());
+//            responseModel.setReqId(reqId);
+//
+//            channelSender.sendMsgLocal((NioSocketChannel)channel, responseModel);
+//
+//            return true;
+//        }
         return false;
     }
 

core/src/main/java/com/wecloud/im/controller/ImMultiMeetController.java

@@ -5,9 +5,6 @@ import com.wecloud.im.param.AgreeToMultiMeetParam;
 import com.wecloud.im.param.InviteToMultiMeetParam;
 import com.wecloud.im.param.LeaveFromMultiMeetParam;
 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 io.geekidea.springbootplus.framework.common.api.ApiCode;
 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;
 import com.wecloud.im.entity.ImMessageOnlineSend;
 import com.wecloud.im.enums.ChatTypeEnum;
 import com.wecloud.im.enums.GroupRoleEnum;
+import com.wecloud.im.enums.MutedEnum;
 import com.wecloud.im.mapper.ImConversationMapper;
 import com.wecloud.im.param.ImClientSimpleDto;
 import com.wecloud.im.param.ListConversationMembersParam;
@@ -208,9 +209,11 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
         ImConversationMembers imConversationMembers = new ImConversationMembers();
         imConversationMembers.setId(imConversationMembersId);
         imConversationMembers.setCreateTime(new Date());
+        imConversationMembers.setUpdateTime(new Date());
         imConversationMembers.setFkAppid(createClient.getFkAppid());
         imConversationMembers.setFkConversationId(imConversationId);
         imConversationMembers.setFkClientId(creator);
+        imConversationMembers.setClientId(createClient.getClientId());
         imConversationMembers.setRole(GroupRoleEnum.OWNER.getCode());
         imConversationMembersService.save(imConversationMembers);
 
@@ -222,9 +225,11 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
             ImConversationMembers imConversationMembers2 = new ImConversationMembers();
             imConversationMembers2.setId(SnowflakeUtil.getId());
             imConversationMembers2.setCreateTime(new Date());
+            imConversationMembers2.setUpdateTime(new Date());
             imConversationMembers2.setFkAppid(createClient.getFkAppid());
             imConversationMembers2.setFkConversationId(imConversationId);
             imConversationMembers2.setFkClientId(client2.getId());
+            imConversationMembers2.setClientId(client2.getClientId());
             imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
             imConversationMembersService.save(imConversationMembers2);
             if (imConversationCreate.getClientIds().size() > 1) {
@@ -304,11 +309,14 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
 
             Long imConversationMembersId2 = SnowflakeUtil.getId();
             ImConversationMembers imConversationMembers2 = new ImConversationMembers();
+            imConversationMembers2.setUpdateTime(new Date());
             imConversationMembers2.setId(imConversationMembersId2);
             imConversationMembers2.setCreateTime(new Date());
             imConversationMembers2.setFkAppid(imApplication.getId());
             imConversationMembers2.setFkConversationId(imClientToConversation.getConversationId());
             imConversationMembers2.setFkClientId(clientToConversation.getId());
+            imConversationMembers2.setClientId(clientToConversation.getClientId());
+            imConversationMembers2.setMuted(MutedEnum.NO.getCode());
             imConversationMembers2.setRole(GroupRoleEnum.NORMAL.getCode());
             imConversationMembersService.save(imConversationMembers2);