fix 第一条消息限制

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/TourMemberImpl.java

@@ -475,7 +475,7 @@ public class TourMemberImpl extends ServiceImpl<TourImMemberMapper, TourImMember
             InteractionMessageDto bean = JSONUtil.toBean(messageContent, InteractionMessageDto.class);
 
             String type = bean.getNoticeType();
-            String getUserId = bean.getGetUserId();
+            String getUserId = lsMessage.getCreateUserId().toString();
             //业务
             String business="";
             if(BusinessType.TRAVELNOTES.getCode().equals(bean.getType())){

application-webadmin/src/main/java/com/tourism/webadmin/app/website/vo/InteractionListVo.java

@@ -37,7 +37,7 @@ public class InteractionListVo {
     private String showName;
 
     /**发送时间*/
-    private String creatTime;
+    private String createTime;
 
     /**发送人和自己的关系*/
     private String state;

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

@@ -279,7 +279,7 @@ public class SystemMessageHandler extends AbstractWebSocketHandler {
                             .eq(TourImMessage::getGroupId, messageDTO.getGroupId())
                     );
                 }
-                if (messageCount == 1 ||fansList.isEmpty()) {
+                if (messageCount >= 1 && fansList.isEmpty()) {
                     messageDTO.setMessageLimit(1);
                     return;
                 }
@@ -305,13 +305,12 @@ public class SystemMessageHandler extends AbstractWebSocketHandler {
         }
         //单聊
         if (groupMap.containsKey(messageDTO.getGroupId())) {
+            sendGroupAllMessage(messageDTO.getGroupId(),new TextMessage(JSON.toJSONString(messageDTO)));
             Map<String, WebSocketSession> groupSingleMessageMap = groupMap.get(messageDTO.getGroupId());
             String getUserId = messageDTO.getGetUserId();
             messageDTO.setSendUserId(id);
             messageService.save(messageDTO);
-            messageDTO.setSendUserId(id);
             //在线情况
-            sendGroupAllMessage(messageDTO.getGroupId(),new TextMessage(JSON.toJSONString(messageDTO)));
             //不在线情况 直接入库 默认全未读
             return;
         }