feat: "第四次部署尝试"

.drone.yml

@@ -17,6 +17,7 @@ steps:
         from_secret: docker-username
       password:
         from_secret: docker-password
+      registry: registry.cn-hangzhou.aliyuncs.com
       repo: registry.cn-hangzhou.aliyuncs.com/english-ai/eai-backend
       tags: latest
       dockerfile: Dockerfile
@@ -32,7 +33,6 @@ steps:
         from_secret: docker-password
       DOCKER_REGISTRY: registry.cn-hangzhou.aliyuncs.com
       IMAGE_NAME: english-ai/eai-backend
-      # 假设这个标签是你想要部署的标签，可以根据实际情况修改
       IMAGE_TAG: latest
     commands:
       - echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin $DOCKER_REGISTRY

src/main/java/com/njuzr/eaibackend/controller/CourseController.java

@@ -1,7 +1,10 @@
 package com.njuzr.eaibackend.controller;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njuzr.eaibackend.dto.CourseDTO;
 import com.njuzr.eaibackend.dto.EnrollDTO;
+import com.njuzr.eaibackend.po.Course;
+import com.njuzr.eaibackend.po.User;
 import com.njuzr.eaibackend.service.CourseService;
 import com.njuzr.eaibackend.vo.CourseVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,12 +35,22 @@ public class CourseController {
      */
     @GetMapping("/findAll")
     public MyResponse findAllCourses(
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size
+            @RequestParam(value = "page", defaultValue = "1") int currentPage,
+            @RequestParam(value = "size", defaultValue = "10") int pageSize
     ) {
+
         return MyResponse.success("");
     }
 
+//    @GetMapping()
+//    public MyResponse searchCourses(
+//            @RequestParam String courseName,
+//            @RequestParam String
+//    ) {
+//
+//    }
+
+
     /**
      * 根据学生Id获取其所选的所有课程的信息
      * @param studentId
@@ -70,16 +83,18 @@ public class CourseController {
     /**
      * 根据课程Id，获取某个课程的详细信息
      * @param courseId
-     * @param page
-     * @param size
+     * @param currentPage
+     * @param pageSize
      * @return
      */
     @GetMapping("/{courseId}")
     public MyResponse findByCourseId(
             @PathVariable Long courseId,
-            @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size
+            @RequestParam(value = "page", defaultValue = "1") int currentPage,
+            @RequestParam(value = "size", defaultValue = "10") int pageSize
     ) {
+        Page<Course> page = new Page<>(currentPage, pageSize);
+
         return MyResponse.success("");
     }
 

src/main/java/com/njuzr/eaibackend/service/CourseService.java

@@ -11,4 +11,7 @@ import com.njuzr.eaibackend.vo.CourseVO;
 
 public interface CourseService {
     CourseVO createCourse(CourseDTO courseDTO);
+
+    CourseVO findByCourseId(Long courseId);
+
 }

src/main/java/com/njuzr/eaibackend/service/impl/CourseServiceImpl.java

@@ -43,11 +43,7 @@ public class CourseServiceImpl implements CourseService {
     public CourseVO createCourse(CourseDTO courseDTO) {
         log.info("解析CourseDTO："+courseDTO.toString());
         // 类型转换
-        Course targetCourse = new Course();
-        BeanUtils.copyProperties(courseDTO, targetCourse);
-        targetCourse.setTeacherIds(ConvertUtil.listToString(courseDTO.getTeacherIds()));
-        if (courseDTO.getCourseImages() != null)
-            targetCourse.setCourseImages(ConvertUtil.listToString(courseDTO.getCourseImages()));
+        Course targetCourse = convertToPO(courseDTO);
         targetCourse.setCreateTime(new Date());
 
         log.info("类型转换后的targetCourse"+targetCourse);
@@ -59,12 +55,41 @@ public class CourseServiceImpl implements CourseService {
             throw new MyException(HttpStatus.INTERNAL_SERVER_ERROR.value(), HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase()+"："+"创建课程错误");
         }
 
-        // 将结果输出
+        return convertToVO(targetCourse);
+    }
+
+
+    @Override
+    public CourseVO findByCourseId(Long courseId) {
+        Course res = courseMapper.selectById(courseId);
+        return convertToVO(res);
+    }
+
+    /**
+     * 将DTO转换成PO
+     * @param courseDTO
+     * @return
+     */
+    private Course convertToPO(CourseDTO courseDTO) {
+        Course course = new Course();
+        BeanUtils.copyProperties(courseDTO, course);
+        course.setTeacherIds(ConvertUtil.listToString(courseDTO.getTeacherIds()));
+        if (courseDTO.getCourseImages() != null)
+            course.setCourseImages(ConvertUtil.listToString(courseDTO.getCourseImages()));
+        return course;
+    }
+
+    /**
+     * 将PO转换成VO
+     * @param course
+     * @return
+     */
+    private CourseVO convertToVO(Course course) {
         CourseVO res = new CourseVO();
-        BeanUtils.copyProperties(targetCourse, res);
-        res.setTeacherIds(ConvertUtil.stringToList(targetCourse.getTeacherIds(), Long::valueOf));
-        if (targetCourse.getCourseImages() != null)
-            res.setCourseImages(ConvertUtil.stringToList(targetCourse.getCourseImages(), String::valueOf));
+        BeanUtils.copyProperties(course, res);
+        res.setTeacherIds(ConvertUtil.stringToList(course.getTeacherIds(), Long::valueOf));
+        if (course.getCourseImages() != null)
+            res.setCourseImages(ConvertUtil.stringToList(course.getCourseImages(), String::valueOf));
 
         return res;
     }