From 11fc4e4c3f2f053b8b4e4019954ba81ad26b22fa Mon Sep 17 00:00:00 2001
From: none <none>
Date: Sun, 23 Apr 2023 00:26:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=E5=90=8E=E5=8F=B0=E5=AD=A6?=
 =?UTF-8?q?=E5=91=98=E7=BA=BF=E4=B8=8A=E8=AF=BE=E8=AF=BE=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=AF=A6=E6=83=85api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../controller/backend/UserController.java    | 25 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2f1ddc2..a4bd74b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>xyz.playedu</groupId>
     <artifactId>playedu-api</artifactId>
-    <version>0.1-beta.1</version>
+    <version>1.0-beta.4</version>
     <name>playedu-api</name>
     <description>playedu-api</description>
     <properties>
diff --git a/src/main/java/xyz/playedu/api/controller/backend/UserController.java b/src/main/java/xyz/playedu/api/controller/backend/UserController.java
index a67ae9f..ca293de 100644
--- a/src/main/java/xyz/playedu/api/controller/backend/UserController.java
+++ b/src/main/java/xyz/playedu/api/controller/backend/UserController.java
@@ -370,7 +370,7 @@ public class UserController {
     @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN)
     @GetMapping("/{id}/learn-hours")
     @SneakyThrows
-    public JsonResponse latestLearnHours(
+    public JsonResponse learnHours(
             @PathVariable(name = "id") Integer id, @RequestParam HashMap<String, Object> params) {
         Integer page = MapUtils.getInteger(params, "page", 1);
         Integer size = MapUtils.getInteger(params, "size", 10);
@@ -405,7 +405,7 @@ public class UserController {
 
     @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN)
     @GetMapping("/{id}/learn-courses")
-    public JsonResponse latestLearnCourses(
+    public JsonResponse learnCourses(
             @PathVariable(name = "id") Integer id, @RequestParam HashMap<String, Object> params) {
         Integer page = MapUtils.getInteger(params, "page", 1);
         Integer size = MapUtils.getInteger(params, "size", 10);
@@ -438,6 +438,27 @@ public class UserController {
         return JsonResponse.data(data);
     }
 
+    @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN)
+    @GetMapping("/{id}/learn-course/{courseId}")
+    @SneakyThrows
+    public JsonResponse learnCourseDetail(
+            @PathVariable(name = "id") Integer id,
+            @PathVariable(name = "courseId") Integer courseId) {
+        // 读取线上课下的所有课时
+        List<CourseHour> hours = courseHourService.getHoursByCourseId(courseId);
+        // 读取学员的课时学习记录
+        List<UserCourseHourRecord> records = userCourseHourRecordService.getRecords(id, courseId);
+
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("hours", hours);
+        data.put(
+                "learn_records",
+                records.stream()
+                        .collect(Collectors.toMap(UserCourseHourRecord::getHourId, e -> e)));
+
+        return JsonResponse.data(data);
+    }
+
     @BackendPermissionMiddleware(slug = BPermissionConstant.USER_LEARN)
     @GetMapping("/{id}/learn-stats")
     @SneakyThrows