From 1cf7bc13a3e32769bbea477f613f60ed9edd4aac Mon Sep 17 00:00:00 2001 From: none Date: Tue, 21 Mar 2023 17:07:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E6=97=B6=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/backend/CourseHourController.java | 5 ++++- src/main/java/xyz/playedu/api/domain/CourseHour.java | 6 ++++++ .../playedu/api/request/backend/CourseHourMultiRequest.java | 6 ++++-- .../xyz/playedu/api/service/impl/CourseServiceImpl.java | 2 -- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java b/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java index 6887f6d..a4a8b75 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/CourseHourController.java @@ -1,5 +1,6 @@ package xyz.playedu.api.controller.backend; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +30,7 @@ import java.util.*; * @create 2023/2/26 17:50 */ @RestController +@Slf4j @RequestMapping("/backend/v1/course/{courseId}/hour") public class CourseHourController { @@ -92,7 +94,8 @@ public class CourseHourController { List hours = new ArrayList<>(); Date now = new Date(); - for (CourseHourMultiRequest.CourseHourItem item : req.getHours()) { + for (CourseHourMultiRequest.HourItem item : req.getHours()) { + log.info("hourItem {}", item); hours.add(new CourseHour() {{ setCourseId(courseId); setChapterId(item.getChapterId()); diff --git a/src/main/java/xyz/playedu/api/domain/CourseHour.java b/src/main/java/xyz/playedu/api/domain/CourseHour.java index 9f60549..cd73438 100644 --- a/src/main/java/xyz/playedu/api/domain/CourseHour.java +++ b/src/main/java/xyz/playedu/api/domain/CourseHour.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; /** @@ -24,11 +27,13 @@ public class CourseHour implements Serializable { /** * 课程ID */ + @JsonProperty("course_id") private Integer courseId; /** * 章节ID */ + @JsonProperty("chapter_id") private Integer chapterId; /** @@ -59,6 +64,7 @@ public class CourseHour implements Serializable { /** * */ + @JsonIgnore private Date createdAt; @TableField(exist = false) diff --git a/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java b/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java index 74fffac..03a9d6f 100644 --- a/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java +++ b/src/main/java/xyz/playedu/api/request/backend/CourseHourMultiRequest.java @@ -1,5 +1,6 @@ package xyz.playedu.api.request.backend; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -12,7 +13,8 @@ import java.util.List; @Data public class CourseHourMultiRequest { @Data - public class CourseHourItem { + public static class HourItem { + @JsonProperty("chapter_id") private Integer chapterId; private String title; private Integer duration; @@ -22,5 +24,5 @@ public class CourseHourMultiRequest { } @NotNull(message = "hours参数不存在") - private List hours; + private List hours; } diff --git a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java index 0bc083c..1cd6012 100644 --- a/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/CourseServiceImpl.java @@ -25,7 +25,6 @@ import java.util.stream.Collectors; * @createDate 2023-02-24 14:14:01 */ @Service -@Slf4j public class CourseServiceImpl extends ServiceImpl implements CourseService { @Autowired @@ -199,7 +198,6 @@ public class CourseServiceImpl extends ServiceImpl impleme .list(courseDepartmentService.query().getWrapper().in("course_id", courseIds)) .stream() .collect(Collectors.groupingBy(CourseDepartment::getCourseId)); - log.info("data {}", data); Map> result = new HashMap<>(); data.forEach((courseId, records) -> { result.put(courseId, records.stream().map(CourseDepartment::getDepId).toList());