|
|
|
@ -85,6 +85,19 @@ public class UserMessageController extends BaseController {
|
|
|
|
|
UserMessage userMessageComment = userMessageService.findByUseridAndType(userId,MessageTypeEnum.COMMENT.getType());// 评论
|
|
|
|
|
UserMessage userMessageFollow = userMessageService.findByUseridAndType(userId,MessageTypeEnum.FOLLOW.getType());//
|
|
|
|
|
UserMessage userMessageThumbup = userMessageService.findByUseridAndType(userId,MessageTypeEnum.THUMB_UP.getType());//
|
|
|
|
|
if (userMessageComment != null) {
|
|
|
|
|
UserInfo userInfo1 = userInfoService.findById(userMessageComment.getSendUserId());
|
|
|
|
|
userMessageComment.setContent(userInfo1.getNickName()+ " 回复了你的评论");
|
|
|
|
|
}
|
|
|
|
|
if (userMessageFollow != null) {
|
|
|
|
|
UserInfo userInfo2 = userInfoService.findById(userMessageFollow.getSendUserId());
|
|
|
|
|
userMessageFollow.setContent(userInfo2.getNickName()+" 关注了你");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(userMessageThumbup !=null) {
|
|
|
|
|
UserInfo userInfo3 = userInfoService.findById(userMessageThumbup.getSendUserId());
|
|
|
|
|
userMessageThumbup.setContent(userInfo3.getNickName()+ " 点赞了你的评论");
|
|
|
|
|
}
|
|
|
|
|
map.put("comment",userMessageComment);
|
|
|
|
|
map.put("follow",userMessageFollow);
|
|
|
|
|
map.put("thumbup",userMessageThumbup);
|
|
|
|
|