消息格式变化

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FollowFansRecordServiceImpl.java

@@ -11,6 +11,7 @@ import com.wwdz.ch.core.util.RedisUtils;
 import com.wwdz.ch.db.dao.FollowFansRecordDao;
 import com.wwdz.ch.db.domain.FollowFansRecord;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
+import com.wwdz.ch.wx.entity.MessageContentText;
 import com.wwdz.ch.wx.entity.request.MessageRequestDto;
 import com.wwdz.ch.wx.entity.vo.FollowFansRecordVo;
 import com.wwdz.ch.wx.service.FollowFansRecordService;
@@ -18,6 +19,7 @@ import com.wwdz.ch.wx.service.MessageService;
 import com.wwdz.ch.wx.util.StringUtil;
 import com.xxdxxs.utils.DateUtils;
 import com.xxdxxs.utils.EntityMapper;
+import com.xxdxxs.utils.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,7 +80,12 @@ public class FollowFansRecordServiceImpl implements FollowFansRecordService {
             messageRequestDto.setSenderId(dto.getFansId());
             messageRequestDto.setReceiverId(dto.getFollowerId());
             messageRequestDto.setType(MessageEnum.TypeEnum.FOLLOW.getCode());
-            messageRequestDto.setContent("关注了您");
+
+            MessageContentText messageContentText = new MessageContentText();
+            messageContentText.setId(dto.getFansId());
+            messageContentText.setIdType(MessageEnum.ContentIdTypeEnum.USERID.getCode());
+            messageContentText.setText("关注了您");
+            messageRequestDto.setContent(JsonUtils.from(messageContentText));
             messageService.add(messageRequestDto);
             //五分钟内再次关注不会发送消息
             redisUtils.set(messageKey, LocalDateTime.now(), 60 * 5);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/MessageServiceImpl.java

 package com.wwdz.ch.wx.impl;
 
 import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.core.consts.FollowFansEnum;
 import com.wwdz.ch.core.consts.MessageEnum;
 import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.type.PageSearchResult;
@@ -16,14 +17,18 @@ import com.wwdz.ch.db.domain.MessageContent;
 import com.wwdz.ch.db.domain.MessageRecord;
 import com.wwdz.ch.db.dto.MessageRecordRequestDto;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
+import com.wwdz.ch.wx.entity.MessageContentText;
 import com.wwdz.ch.wx.entity.request.MessageRequestDto;
 import com.wwdz.ch.wx.entity.vo.FollowFansRecordVo;
 import com.wwdz.ch.wx.entity.vo.MessageVo;
+import com.wwdz.ch.wx.service.FavoritesService;
 import com.wwdz.ch.wx.service.MessageService;
 import com.xxdxxs.entity.Entity;
 import com.xxdxxs.service.FormHandler;
 import com.xxdxxs.utils.EntityMapper;
+import com.xxdxxs.utils.JsonUtils;
 import com.xxdxxs.validation.Validator;
+import org.apache.logging.log4j.spi.ObjectThreadContextMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +67,9 @@ public class MessageServiceImpl implements MessageService {
     @Autowired
     RedisUtils redisUtils;
 
+    @Autowired
+    FavoritesService favoritesService;
+
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -141,31 +149,48 @@ public class MessageServiceImpl implements MessageService {
                     time = new SimpleDateFormat("yyyy-MM-dd").format(messageCreateTime);
                 }
                 Map<String, Object> contentMap = new HashMap<>();
+                String content = messageContentMap.get(m.getMessageId()).getContent();
+                MessageContentText messageContentText = JsonUtils.to(content, MessageContentText.class);
                 if (MessageEnum.TypeEnum.SHARE.getCode() == m.getType().intValue()) {
-                    long itemId = Long.valueOf(messageContentMap.get(m.getMessageId()).getContent());
-                    Item item = itemDao.findDetails(itemId);
-                    contentMap.put("item", MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
-                    contentMap.put("msg", "分享了您的藏品");
+                    Object image = null;
+                    if (MessageEnum.ContentIdTypeEnum.COLLECTION_BOOK.getCode() == messageContentText.getIdType().intValue()) {
+                        image = favoritesService.getFavoritesImage(messageContentText.getId());
+                    } else if (MessageEnum.ContentIdTypeEnum.ITEM.getCode() == messageContentText.getIdType().intValue()){
+                        Item item = itemDao.findDetails(messageContentText.getId());
+                        image = MediaUtil.getHomePageImage(item.getImages(), item.getVideos());
+                    }
+                    contentMap.put("image", image);
+                    contentMap.put("id", messageContentText.getId());
+                    contentMap.put("idType", messageContentText.getIdType());
+                    contentMap.put("msg", messageContentText.getText());
                 } else if (MessageEnum.TypeEnum.COLLECT.getCode() == m.getType().intValue()) {
-                    long itemId = Long.valueOf(messageContentMap.get(m.getMessageId()).getContent());
-                    Item item = itemDao.findDetails(itemId);
-                    contentMap.put("item", MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
-                    contentMap.put("msg", "收藏了您的藏品");
+                    contentMap.put("id", messageContentText.getId());
+                    contentMap.put("idType", messageContentText.getIdType());
+                    Object image = null;
+                    if (MessageEnum.ContentIdTypeEnum.COLLECTION_BOOK.getCode() == messageContentText.getIdType().intValue()) {
+                        image =favoritesService.getFavoritesImage(messageContentText.getId());
+                    } else if (MessageEnum.ContentIdTypeEnum.ITEM.getCode() == messageContentText.getIdType().intValue()){
+                        Item item = itemDao.findDetails(messageContentText.getId());
+                        image = MediaUtil.getHomePageImage(item.getImages(), item.getVideos());
+                    }
+                    contentMap.put("image", image);
+                    contentMap.put("msg", messageContentText.getText());
                 }
                 else if (MessageEnum.TypeEnum.FOLLOW.getCode() == m.getType().intValue()) {
-                    contentMap.put("msg", "关注了您");
+                    contentMap.put("msg", messageContentText.getText());
                     //查询关注的人
                     FollowFansRecordRequestDto dto = new FollowFansRecordRequestDto();
                     dto.setFansId(messageRequestDto.getReceiverId());
                     List<FollowFansRecord> followFansRecordList = followFansRecordDao.findList(dto);
                     List<Long> followerIdList = followFansRecordList.stream().map(FollowFansRecord::getFollowerId).collect(Collectors.toList());
                     if (followerIdList.contains(messageContentMap.get(m.getMessageId()).getSenderId())) {
-                        contentMap.put("relation", "互相关注");
+                        contentMap.put("relation", FollowFansEnum.RelationEnum.BOTH_FOLLOWED.getDes());
                         contentMap.put("isFollowed", true);
                         int id = followFansRecordList.stream().filter(f->f.getFollowerId().longValue() == messageContentMap.get(m.getMessageId()).getSenderId()).map(FollowFansRecord::getId).findFirst().get();
                         contentMap.put("id", id);
+                        contentMap.put("idType", messageContentText.getIdType());
                     } else {
-                        contentMap.put("relation", "回关");
+                        contentMap.put("relation",  FollowFansEnum.RelationEnum.BACK_FOLLOWED.getDes());
                         contentMap.put("isFollowed", false);
                     }
                 }