|
@@ -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());
|
|
|
}
|
|
|
}
|
|
|
//填充每个用户的关注状态
|