Commit 94a20617 authored by 刘基明's avatar 刘基明

消息通知初始化

parent 277366c1
...@@ -77,6 +77,8 @@ public class NotificationManager { ...@@ -77,6 +77,8 @@ public class NotificationManager {
public List<ThemeNotifyQo> queryList(NotifyQueryReq req, String userId) { public List<ThemeNotifyQo> queryList(NotifyQueryReq req, String userId) {
List<NotificationEntity> query = notificationService.query(userId, req.getType(), req.getLastId(), req.getPageSize()); List<NotificationEntity> query = notificationService.query(userId, req.getType(), req.getLastId(), req.getPageSize());
List<ThemeNotifyQo> themeNotifyQos = ConvertUtil.notificationEntitiy2ThemeQos(query); List<ThemeNotifyQo> themeNotifyQos = ConvertUtil.notificationEntitiy2ThemeQos(query);
UserInfoResp currentUser = redisCache.getObject(StringUtils.joinWith("_", CACHE_FEIGN_USER_INFO, userId),
60, () -> this.getUserInfo(userId), UserInfoResp.class);
for (ThemeNotifyQo themeNotifyQo : themeNotifyQos) { for (ThemeNotifyQo themeNotifyQo : themeNotifyQos) {
// 用户信息 // 用户信息
...@@ -94,13 +96,14 @@ public class NotificationManager { ...@@ -94,13 +96,14 @@ public class NotificationManager {
if (StringUtils.isNotEmpty(themeNotifyQo.getFormerThemeId())) { if (StringUtils.isNotEmpty(themeNotifyQo.getFormerThemeId())) {
ThemeEntity former = themeService.queryByThemeId(themeNotifyQo.getFormerThemeId()); ThemeEntity former = themeService.queryByThemeId(themeNotifyQo.getFormerThemeId());
if (former != null) { if (former != null) {
themeNotifyQo.setFormerUserName(currentUser.getNickName());
if (ThemeTypeEnum.DISCUSSION.getCode().equals(former.getThemeType())) { if (ThemeTypeEnum.DISCUSSION.getCode().equals(former.getThemeType())) {
List<ThemeContentQo> themeContentQos = JsonUtil.toBean(former.getContent(), new TypeReference<List<ThemeContentQo>>() { List<ThemeContentQo> themeContentQos = JsonUtil.toBean(former.getContent(), new TypeReference<List<ThemeContentQo>>() {
}); });
themeNotifyQo.setContent(themeContentQos.get(0).getValue()); themeNotifyQo.setFormerContent(themeContentQos.get(0).getValue());
} }
if (ThemeTypeEnum.LONG_TEXT.getCode().equals(former.getThemeType())) { if (ThemeTypeEnum.LONG_TEXT.getCode().equals(former.getThemeType())) {
themeNotifyQo.setContent(former.getTitle()); themeNotifyQo.setFormerContent(former.getTitle());
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment