From dd663d0ac783755d889e270eee57ee58630c88c8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:46:52 +0800
Subject: [PATCH] 冥想2.0新增代码
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
index 2544863..7dc0320 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java
@@ -2,22 +2,29 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.meditation.api.domain.Meditation;
import com.xinquan.meditation.domain.MeditationEveryday;
import com.xinquan.meditation.domain.MeditationMusic;
+import com.xinquan.meditation.domain.MeditationVideo;
import com.xinquan.meditation.domain.vo.ClientMeditationEverydayVO;
import com.xinquan.meditation.domain.vo.ClientMeditationVO;
import com.xinquan.meditation.mapper.MeditationEverydayMapper;
import com.xinquan.meditation.mapper.MeditationMapper;
import com.xinquan.meditation.mapper.MeditationMusicMapper;
+import com.xinquan.meditation.mapper.MeditationVideoMapper;
import com.xinquan.meditation.service.MeditationEverydayService;
import java.util.List;
import java.util.Optional;
+
+import com.xinquan.user.api.feign.RemoteAppUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -33,7 +40,11 @@
private final MeditationMapper meditationMapper;
private final MeditationMusicMapper meditationMusicMapper;
+ @Resource
+ private RemoteAppUserService remoteAppUserService;
+ @Resource
+ private MeditationVideoMapper meditationVideoMapper;
/**
* 查询每日冥想
@@ -43,12 +54,14 @@
@Override
public ClientMeditationEverydayVO getTodayMeditation() {
ClientMeditationEverydayVO vo = new ClientMeditationEverydayVO();
+
+
// 当前时间
String now = DateUtils.dateTimeNow("HH:mm:ss");
// 查询播放时间段在当前时间的每日冥想
Optional<MeditationEveryday> meditationEverydayOpt = this.lambdaQuery()
- .ge(MeditationEveryday::getStartPlayTime, now)
- .le(MeditationEveryday::getEndPlayTime, now)
+ .le(MeditationEveryday::getStartPlayTime, now)
+ .ge(MeditationEveryday::getEndPlayTime, now)
.orderByDesc(MeditationEveryday::getUpdateTime)
.last("limit 1").oneOpt();
if (!meditationEverydayOpt.isPresent()) {
@@ -75,6 +88,9 @@
vo = BeanUtils.copyBean(meditationEveryday,
ClientMeditationEverydayVO.class);
clientMeditationVO.setBackgroundUrl(meditationOpt.get().getBackgroundUrl());
+ // 查询冥想实际学习人数
+ Long data = remoteAppUserService.getMeditationHistoryCount(meditationId).getData();
+ clientMeditationVO.setRealLearnedNum(Integer.valueOf(data+""));
vo.setClientMeditationVO(clientMeditationVO);
if (meditation!=null){
List<MeditationMusic> meditationId1 = meditationMusicMapper.selectList(new QueryWrapper<MeditationMusic>()
@@ -89,6 +105,13 @@
vo.setImageUrl(meditationEveryday.getImageUrl());
}
+ MeditationVideo meditationVideo = meditationVideoMapper.selectOne(null);
+ if (meditationVideo==null){
+ vo.setIsShow(0);
+ }else{
+ vo.setIsShow(meditationVideo.getIsShow());
+ vo.setMeditationVideo(meditationVideo);
+ }
return vo;
}
}
--
Gitblit v1.7.1