From 9d9f219291c8c60fcea1a5790e16980d19dd226a Mon Sep 17 00:00:00 2001 From: lichong Date: Sun, 22 Sep 2024 00:58:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=BE=E7=A8=8B=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=88=96=E7=BC=96=E8=BE=91=E6=97=B6=E5=8F=AF=E4=BB=A5=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E5=A4=9A=E4=B8=AA=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/ielts/course/domain/vo/CourseAddOrEditVo.java | 3 +++ .../module/ielts/course/service/impl/CourseServiceImpl.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/domain/vo/CourseAddOrEditVo.java b/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/domain/vo/CourseAddOrEditVo.java index 3a9bdc7..b3ca79e 100644 --- a/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/domain/vo/CourseAddOrEditVo.java +++ b/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/domain/vo/CourseAddOrEditVo.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import java.math.BigDecimal; +import java.util.List; /** * @author 李冲 @@ -46,5 +47,7 @@ public class CourseAddOrEditVo { private Long courseMediaStorageId; @Schema(description = "课程简介文件ID") private Long courseDescriptionStorageId; + @Schema(description = "课程附件ID列表") + private List courseAttachmentStorageIds; } diff --git a/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/service/impl/CourseServiceImpl.java b/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/service/impl/CourseServiceImpl.java index f8bf74b..386f6f8 100644 --- a/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/service/impl/CourseServiceImpl.java +++ b/module/ielts/src/main/java/org/funcode/portal/server/module/ielts/course/service/impl/CourseServiceImpl.java @@ -21,6 +21,10 @@ import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.HashSet; +import java.util.List; /** * @author 李冲 @@ -84,6 +88,7 @@ private Course transAddOrEditVoToCourse(CourseAddOrEditVo courseAddOrEditVo) { Storage mediaStorage = storageRepository.getReferenceById(mediaStorageId); Storage coverStorage = storageRepository.getReferenceById(courseAddOrEditVo.getCourseCoverStorageId()); Storage descriptionStorage = storageRepository.getReferenceById(courseAddOrEditVo.getCourseDescriptionStorageId()); + List courseAttachmentStorages = storageRepository.findAllById(courseAddOrEditVo.getCourseAttachmentStorageIds()); return Course.builder() .id(courseAddOrEditVo.getId()) .title(courseAddOrEditVo.getTitle()) @@ -92,6 +97,7 @@ private Course transAddOrEditVoToCourse(CourseAddOrEditVo courseAddOrEditVo) { .courseMediaStorage(mediaStorage) .courseCoverStorage(coverStorage) .courseDescriptionStorage(descriptionStorage) + .courseAttachmentStorages(CollectionUtils.isEmpty(courseAttachmentStorages) ? new HashSet<>() : new HashSet<>(courseAttachmentStorages)) .build(); } }