Selaa lähdekoodia

fix 聊天优化

classic_blue 1 kuukausi sitten
vanhempi
commit
0183d5c33f

+ 9 - 12
application-webadmin/src/main/java/com/tourism/webadmin/ws/handle/SystemMessageHandler.java

@@ -310,21 +310,18 @@ public class SystemMessageHandler extends AbstractWebSocketHandler {
                 }
             }
 
-            //3群被解散
-            if (tourImGroup.getDataState() ==-1){
-                messageDTO.setMessageLimit(MessageLimitType.MESSAGE_LIMIT_DISSOLVE.getCode());
-            }
-            //4群被封禁
-            if (tourImGroup.getBannedStatus()==0){
-                messageDTO.setMessageLimit(MessageLimitType.MESSAGE_LIMIT_BANNED.getCode());
-            }
-            //2已被踢出群聊
-            long count = tourMemberService.count(new LambdaQueryWrapper<TourImMember>()
+
+            long count = tourMemberService.count(new LambdaQueryWrapper<TourImMember>()//2已被踢出群聊
                     .eq(TourImMember::getGroupId, tourImGroup.getId())
                     .eq(TourImMember::getUserId, id)
                     .eq(TourImMember::getDataState,1));
-            if (count == 0) {
-                messageDTO.setMessageLimit(MessageLimitType.MESSAGE_LIMIT_KICK_OUT.getCode());
+
+            if (tourImGroup.getDataState() ==-1){
+                messageDTO.setMessageLimit(MessageLimitType.MESSAGE_LIMIT_DISSOLVE.getCode()); //3群被解散
+            } else if (tourImGroup.getBannedStatus()==0){
+                messageDTO.setMessageLimit(MessageLimitType.MESSAGE_LIMIT_BANNED.getCode());//4群被封禁
+            } else if (count == 0) {
+                messageDTO.setMessageLimit(MessageLimitType.MESSAGE_LIMIT_KICK_OUT.getCode());//4被踢出群聊
             }
             if (messageDTO.getMessageLimit()!=0) {
                 sendMessage(JSON.toJSONString(messageDTO),sessionMap.get(id));