From 64f7ccb9ef8b5a0618e65cddc14b981c1f108ba3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 04 十一月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationEverydayController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationEverydayController.java b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationEverydayController.java
index 46a9346..49fbafb 100644
--- a/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationEverydayController.java
+++ b/xinquan-modules/xinquan-meditation/src/main/java/com/xinquan/meditation/controller/client/ClientMeditationEverydayController.java
@@ -23,6 +23,7 @@
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -55,6 +56,10 @@
}
for (MeditationEveryday record : page.getRecords()) {
record.setUid(record.getId()+"");
+ Meditation byId = meditationService.getById(record.getMeditationId());
+ if (byId!=null){
+ record.setMeditationTitle(byId.getMeditationTitle());
+ }
}
return R.ok(PageDTO.of(page, MeditationEveryday.class));
}
@@ -70,28 +75,28 @@
return R.ok(list);
}
@PostMapping("/addMeditationEveryday")
- @ApiOperation(value = "新增每日冥想库管理", notes = "管理后台-每日冥想库管理")
+ @ApiOperation(value = "新增每日冥想库管理", tags = "管理后台-每日冥想库管理")
public R addMeditationEveryday(@RequestBody MeditationEveryday homeBackgroundMusic) {
homeBackgroundMusic.setCreateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setCreateTime(LocalDateTime.now());
return R.ok(meditationEverydayService.save(homeBackgroundMusic));
}
@GetMapping("/detailMeditationEveryday")
- @ApiOperation(value = "查看详情每日冥想库管理", notes = "管理后台-每日冥想库管理")
+ @ApiOperation(value = "查看详情每日冥想库管理", tags = "管理后台-每日冥想库管理")
public R<MeditationEveryday> detailMeditationEveryday(String uid) {
return R.ok(meditationEverydayService.getById(uid));
}
@PostMapping("/updateMeditationEveryday")
- @ApiOperation(value = "修改每日冥想库管理", notes = "管理后台-每日冥想库管理")
+ @ApiOperation(value = "修改每日冥想库管理", tags = "管理后台-每日冥想库管理")
public R updateMeditationEveryday(@RequestBody MeditationEveryday homeBackgroundMusic) {
homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setUpdateTime(LocalDateTime.now());
return R.ok(meditationEverydayService.updateById(homeBackgroundMusic));
}
@PostMapping("/deleteMeditationEveryday")
- @ApiOperation(value = "批量删除", notes = "管理后台-每日冥想库管理")
+ @ApiOperation(value = "批量删除", tags = "管理后台-每日冥想库管理")
public R deleteMeditationEveryday(String ids) {
- return R.ok(meditationEverydayService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.ok(meditationEverydayService.removeBatchByIds(Arrays.asList(ids.split(",")).stream().map(Long::valueOf).collect(Collectors.toList())));
}
}
--
Gitblit v1.7.1