From bbc55de9bb0f6e5d3d8267c628d25780c19ebf36 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 08 二月 2025 17:20:06 +0800
Subject: [PATCH] 冥想2.0新增代码

---
 xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/service/impl/MeditationEverydayServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 ae3fdeb..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,16 +2,19 @@
 
 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;
@@ -40,6 +43,8 @@
     @Resource
     private RemoteAppUserService remoteAppUserService;
 
+    @Resource
+    private MeditationVideoMapper meditationVideoMapper;
 
     /**
      * 查询每日冥想
@@ -49,6 +54,8 @@
     @Override
     public ClientMeditationEverydayVO getTodayMeditation() {
         ClientMeditationEverydayVO vo = new ClientMeditationEverydayVO();
+
+
         // 当前时间
         String now = DateUtils.dateTimeNow("HH:mm:ss");
         // 查询播放时间段在当前时间的每日冥想
@@ -98,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