From 111652d23733d04e379c2454c8b39171596a6b50 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 14:28:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java
index a4e83b4..98b5714 100644
--- a/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java
+++ b/xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java
@@ -9,6 +9,8 @@
import com.xinquan.common.core.web.domain.BaseModel;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.meditation.api.domain.Meditation;
+import com.xinquan.meditation.api.domain.MeditationQuestion;
import com.xinquan.meditation.api.feign.RemoteMeditationService;
import com.xinquan.system.api.domain.AppUser;
import com.xinquan.system.api.domain.NoticeRecord;
@@ -91,7 +93,20 @@
if (noticeRecord!=null && noticeRecord.getMeditationQuestionId()!=null){
// 远程调用 根据冥想提问id 查询数据
noticeDetailVO.setMeditationQuestionId(noticeRecord.getMeditationQuestionId());
-// NoticeDetailVO data = remoteMeditationService.noticeDetail(noticeDetailVO).getData();
+ Meditation data = remoteMeditationService.getMeditationById(noticeRecord.getMeditationId()).getData();
+ MeditationQuestion data1 = remoteMeditationService.getMeditationQuestion(noticeRecord.getMeditationQuestionId() + "").getData();
+ if (data!=null){
+ noticeDetailVO.setMeditationTitle(data.getMeditationTitle());
+ noticeDetailVO.setReplyContent(noticeRecord.getContent());
+ noticeDetailVO.setCoverDescription(data.getDetailDescription());
+ noticeDetailVO.setIconUrl(data.getCoverUrl());
+ }
+ if (data1!=null){
+ noticeDetailVO.setNoticeType(noticeRecord.getNoticeType());
+ noticeDetailVO.setContent(data1.getContent());
+ noticeDetailVO.setReplyContent(data1.getReplyContent());
+ noticeDetailVO.setPublishTime(data1.getCreateTime());
+ }
AppUser byId = appUserService.getById(userId);
noticeDetailVO.setNickname(byId.getNickname());
noticeDetailVO.setAvatar(byId.getAvatar());
--
Gitblit v1.7.1