fix 系统头像

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/TourMessageController.java

@@ -33,13 +33,13 @@ import com.tourism.webadmin.back.dto.TourImMessageDto;
 import com.tourism.webadmin.back.model.TourFans;
 import com.tourism.webadmin.back.model.TourImComplait;
 import com.tourism.webadmin.back.model.TourImGroup;
-import com.tourism.webadmin.back.model.TourImMessage;
-import com.tourism.webadmin.back.model.constant.NoticeType;
+import com.tourism.webadmin.back.model.TourImMessage;import com.tourism.webadmin.back.model.constant.NoticeType;
 import com.tourism.webadmin.back.service.TourFansService;
 import com.tourism.webadmin.back.service.TourImMessageService;
 import com.tourism.webadmin.back.vo.TourImMessageVo;
 import com.tourism.webadmin.back.vo.TourUserVo;
 import com.tourism.webadmin.enums.MyAttentionStatus;
+import com.tourism.webadmin.enums.SystemDefaultHead;
 import com.tourism.webadmin.strategy.dto.FocusDTO;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
@@ -274,7 +274,10 @@ public class TourMessageController {
         PageHelper.startPage(pageNum, pageSize);
 
         //查询全部系统消息
-        List<TourImMessage> messageList = tourMessageService.lambdaQuery().in(TourImMessage::getNoticeType,types).list();
+        List<TourImMessage> messageList = tourMessageService.lambdaQuery()
+                .in(TourImMessage::getNoticeType,types)
+                .like(TourImMessage::getMessageContent, "\""+"getUserId"+"\""+":"+"\""+userId.toString()+"\"")
+                .list();
         MyPageData<TourImMessageVo> pageData = MyPageUtil.makeResponseData(messageList, TourImMessageVo.class);
         List<TourImMessageVo> vo = pageData.getDataList();
         ArrayList<TourImMessageVo> messageVo = new ArrayList<>();
@@ -290,6 +293,7 @@ public class TourMessageController {
                 if (userId.toString().equals(bean.getGetUserId())) {
                     messageVo.add(info);
                 }
+                info.setAvatar(SystemDefaultHead.SYSTEM_USERID_OR_GROUPID.getHead());
             }
             //关注消息
             if (info.getNoticeType() == NoticeType.NOTICE_FOCUS){
@@ -303,6 +307,7 @@ public class TourMessageController {
                 if (userId.toString().equals(bean.getGetUserId())) {
                     messageVo.add(info);
                 }
+                info.setAvatar(SystemDefaultHead.FOCUS_USERID_OR_GROUPID.getHead());
             }
         }
         //填充每个用户的关注状态

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

@@ -34,6 +34,7 @@ import com.tourism.webadmin.back.model.constant.IsTrue;
 import com.tourism.webadmin.back.model.constant.NoticeType;
 import com.tourism.webadmin.back.service.*;
 import com.tourism.webadmin.enums.GroupRole;
+import com.tourism.webadmin.enums.SystemDefaultHead;
 import com.tourism.webadmin.ws.utils.AESUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -450,6 +451,7 @@ public class TourMessageServiceImpl extends ServiceImpl<TourImMessageMapper, Tou
             InteractionMessageDto interactionMessageDto = JSON.parseObject(messageContent, InteractionMessageDto.class);
             item.setBusinessId(interactionMessageDto.getId());
             item.setBusinessType(interactionMessageDto.getType());
+            item.setHeadImage(SystemDefaultHead.INTERACT_USERID_OR_GROUPID.getHead());
             //评论ID
             item.setReviewId(interactionMessageDto.getReviewId());
             if (noticeType.equals("8")) {

application-webadmin/src/main/java/com/tourism/webadmin/back/vo/TourImMessageVo.java

@@ -112,4 +112,7 @@ public class TourImMessageVo extends BaseVo {
      */
     @Schema(description = "messagePO 消息传输po")
     private Map<String,Object> messagePO;
+
+    @Schema(description = "用于系统消息互动消息关注消息头像")
+    private String avatar;
 }

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

@@ -281,6 +281,7 @@ public class SystemMessageHandler extends AbstractWebSocketHandler {
                 }
                 if (messageCount == 1 ||!fansList.isEmpty()) {
                     messageDTO.setMessageLimit(1);
+                    return;
                 }
             }
             if (tourImGroup.getBannedStatus() == 0){

application-webadmin/src/main/java/com/tourism/webadmin/ws/mq/RabbitMQConfig.java

@@ -23,7 +23,7 @@ public class RabbitMQConfig {
 
     @Bean("systemExchange")
     public Exchange systemExchange() {
-        return new FanoutExchange("systemExchange",true,false);
+        return new DirectExchange("systemExchange",true,false);
     }
     @Bean("focusExchange")
     public Exchange focusExchange() {