From 2b23ece9828267329ffc5c38dd96da8157897055 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 17:32:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XinQuanHealing
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 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 5ef4ba5..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
@@ -7,16 +7,21 @@
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
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;
import com.xinquan.meditation.api.domain.vo.NoticeDetailVO;
+import com.xinquan.system.api.model.LoginUser;
import com.xinquan.user.service.AppUserService;
import com.xinquan.user.service.NoticeRecordService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,8 +55,12 @@
@ApiImplicitParam(value = "分页参数，每页数量", name = "pageSize", required = true, dataType = "Integer")
})
public R<PageDTO<NoticeRecord>> noticeList(Integer pageCurr, Integer pageSize) {
- Long userId = SecurityUtils.getUserId();
- if (userId==0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
+ if(userId ==null || userId == 0)return R.tokenError("登录失效");
Page<NoticeRecord> page = noticeRecordService.lambdaQuery()
.eq(NoticeRecord::getAppUserId, userId)
.orderByDesc(BaseModel::getCreateTime)
@@ -69,8 +78,12 @@
@PostMapping("/noticeDetail")
@ApiOperation(value = "系统消息列表-查看详情",tags = "系统消息")
public R<NoticeDetailVO> wallet(Long id) {
- Long userId = SecurityUtils.getUserId();
- if (userId == 0)return R.tokenError("登录失效");
+
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
NoticeRecord noticeRecord = noticeRecordService.getById(id);
// 设置为已读
noticeRecord.setReadStatus(2);
@@ -80,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());
@@ -88,11 +114,16 @@
}
return R.ok(noticeDetailVO);
}
+ @Autowired
+ private TokenService tokenService;
@PostMapping("/queryNotice")
@ApiOperation(value = "是否有未读消息 true是 false否",tags = "系统消息")
public R<Boolean> queryNotice() {
- Long userId = SecurityUtils.getUserId();
- if (userId == 0)return R.tokenError("登录失效");
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
int size = noticeRecordService.lambdaQuery()
.eq(NoticeRecord::getAppUserId, userId)
.eq(NoticeRecord::getReadStatus, 1).list().size();
--
Gitblit v1.7.1