From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交
---
xinquan-modules/xinquan-user/src/main/java/com/xinquan/user/controller/client/ClientNoticeRecordController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 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..68298cc 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
@@ -3,12 +3,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xinquan.common.core.domain.R;
+import com.xinquan.common.core.utils.DateUtils;
import com.xinquan.common.core.utils.page.BeanUtils;
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.course.api.domain.Course;
+import com.xinquan.course.api.feign.RemoteCourseService;
+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;
@@ -20,12 +25,10 @@
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;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
/**
@@ -46,6 +49,26 @@
private AppUserService appUserService;
@Resource
private RemoteMeditationService remoteMeditationService;
+ @Resource
+ private RemoteCourseService remoteCourseService;
+ @GetMapping("/addNotice/{id}/{courseId}/{userId}/{price}")
+ public R addNotice(@PathVariable("id")String id,@PathVariable("courseId")String courseId
+ ,@PathVariable("userId")String userId,@PathVariable("price")String price) {
+ NoticeRecord noticeRecord = new NoticeRecord();
+ noticeRecord.setAppUserId(Long.valueOf(id));
+ noticeRecord.setCourseId(Long.valueOf(courseId));
+ noticeRecord.setReadStatus(1);
+ noticeRecord.setNoticeType(1);
+ noticeRecord.setTitle("你收到一个来自好友的赠送课程");
+ Course data = remoteCourseService.getCourseById(Long.valueOf(courseId)).getData();
+ if (data!=null){
+ noticeRecord.setContent("课程名称:"+data.getCourseTitle()+"。"+"课程价值:￥"+price+"。"+"赠送好友:"
+ +appUserService.getById(Long.valueOf(userId)).getNickname()+";"+"快去个人中心/已购课程查看吧!");
+ }
+ noticeRecord.setUserId(Long.valueOf(userId));
+ noticeRecordService.save(noticeRecord);
+ return R.ok();
+ }
@PostMapping("/noticeList")
@ApiOperation(value = "系统消息列表",tags = "系统消息")
@ApiImplicitParams({
@@ -88,10 +111,32 @@
noticeRecordService.updateById(noticeRecord);
NoticeDetailVO noticeDetailVO = new NoticeDetailVO();
BeanUtils.copyProperties(noticeRecord,noticeDetailVO);
+ LocalDateTime createTime = noticeRecord.getCreateTime();
+ // 定义日期时间格式
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+
+ // 将 LocalDateTime 转换为字符串
+ String formattedDateTime = createTime.format(formatter);
+ // 将其转化为yyyy-MM-dd HH:mm格式
+ noticeDetailVO.setTime(formattedDateTime);
+ noticeDetailVO.setPublishTime(noticeRecord.getCreateTime());
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