From 111652d23733d04e379c2454c8b39171596a6b50 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 14:28:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java
index 5b58e27..579efe1 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientHomeController.java
@@ -5,12 +5,8 @@
import com.xinquan.common.core.constant.SecurityConstants;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.page.PageDTO;
-import com.xinquan.common.core.web.page.PageInfo;
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.domain.HomeBackgroundMusic;
-import com.xinquan.meditation.domain.MeditationHall;
import com.xinquan.meditation.domain.vo.ClientHomeBackgroundMusicVO;
import com.xinquan.meditation.domain.vo.ClientMeditationAndCateVO;
import com.xinquan.meditation.domain.vo.ClientMeditationCategoryVO;
@@ -24,8 +20,7 @@
import com.xinquan.meditation.service.MeditationQuestionService;
import com.xinquan.meditation.service.MeditationService;
import com.xinquan.system.api.RemoteHotWordsService;
-import com.xinquan.system.api.domain.AppUser;
-import com.xinquan.system.api.domain.MeditationQuestion;
+import com.xinquan.meditation.api.domain.MeditationQuestion;
import com.xinquan.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -35,7 +30,6 @@
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
-import java.util.Optional;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
@@ -172,6 +166,11 @@
@GetMapping("/getPersonalityPlan")
@ApiOperation("获取私人订制")
public R<List<ClientMeditationVO>> getPersonalityPlan() {
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser==null){
+ return R.tokenError("登录失效");
+ }
+ Long userId = loginUser.getUserid();
return R.ok(meditationService.getPersonalityPlan());
}
@@ -262,12 +261,8 @@
@ApiOperation("获取冥想音频详情")
@ApiImplicitParam(name = "id", value = "冥想音频id", dataType = "Long", required = true)
public R<ClientMeditationDetailsVO> getMeditationDetails(@RequestParam("id") Long id) {
- LoginUser loginUser = tokenService.getLoginUser();
- if (loginUser==null){
- return R.tokenError("登录失效");
- }
- Long userId = loginUser.getUserid();
- return R.ok(meditationService.getMeditationDetails(id));
+
+ return meditationService.getMeditationDetails(id);
}
@GetMapping("/getMeditationDetailsShare")
@ApiOperation(value = "获取冥想音频详情",tags = "H5分享")
@@ -352,7 +347,7 @@
meditationQuestion.setContent(content);
meditationQuestion.setPublishTime(LocalDateTime.now());
meditationQuestion.setAppUserId(userId);
- meditationQuestion.setShowFlag(1);
+ meditationQuestion.setShowFlag(2);
meditationQuestion.setReportStatus(1);
meditationQuestionService.save(meditationQuestion);
return R.ok();
--
Gitblit v1.7.1