From fef8e1050da603344ed8bda819d390c2c16551ea Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 17:32:05 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 0215cc0..243f90c 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
@@ -37,13 +37,13 @@
*/
@Override
public ClientMeditationEverydayVO getTodayMeditation() {
- ClientMeditationEverydayVO vo = null;
+ ClientMeditationEverydayVO vo = new ClientMeditationEverydayVO();
// 当前时间
String now = DateUtils.dateTimeNow("HH:mm:ss");
// 查询播放时间段在当前时间的每日冥想
Optional<MeditationEveryday> meditationEverydayOpt = this.lambdaQuery()
- .le(MeditationEveryday::getStartPlayTime, now)
- .ge(MeditationEveryday::getEndPlayTime, now)
+ .ge(MeditationEveryday::getStartPlayTime, now)
+ .le(MeditationEveryday::getEndPlayTime, now)
.orderByDesc(MeditationEveryday::getUpdateTime)
.last("limit 1").oneOpt();
if (!meditationEverydayOpt.isPresent()) {
@@ -57,6 +57,11 @@
if (meditationEverydayOpt.isPresent()) {
// 查询冥想详情
MeditationEveryday meditationEveryday = meditationEverydayOpt.get();
+ Long meditationId = meditationEveryday.getMeditationId();
+ Meditation meditation = meditationMapper.selectById(meditationId);
+ if (meditation!=null){
+ vo.setTime(Integer.valueOf(meditation.getTutorAudioSecond()));
+ }
Optional<Meditation> meditationOpt = Optional.ofNullable(
meditationMapper.selectById(
meditationEveryday.getMeditationId()));
--
Gitblit v1.7.1