瀏覽代碼

feat: course表新增了建立时间的属性,修改删除为伪删除。

mjh 4 年之前
父節點
當前提交
9f9a753022

+ 12 - 1
seecoder-portal-common/src/main/java/cn/seecoder/seecoderportalcommon/vo/CourseVO.java

@@ -29,6 +29,8 @@ public class CourseVO {
 
     private Long helperId;
 
+    private OffsetDateTime createdTime;
+
     private CourseState courseState;
 
     public Long getId() {
@@ -143,6 +145,14 @@ public class CourseVO {
         this.teacher = teacher;
     }
 
+    public OffsetDateTime getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(OffsetDateTime createdTime) {
+        this.createdTime = createdTime;
+    }
+
     @Override
     public String toString() {
         return "CourseVO{" +
@@ -154,11 +164,12 @@ public class CourseVO {
                 ", description='" + description + '\'' +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +
-                ", invitationCodet='" + invitationCode + '\'' +
+                ", invitationCode='" + invitationCode + '\'' +
                 ", moocUrl='" + moocUrl + '\'' +
                 ", evalId=" + evalId +
                 ", coderId=" + coderId +
                 ", helperId=" + helperId +
+                ", createdTime=" + createdTime +
                 ", courseState=" + courseState +
                 '}';
     }

+ 14 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/domain/Course.java

@@ -70,6 +70,10 @@ public class Course {
 //    @NotNull
     private Long helperId;
 
+    @Column
+    @NotNull
+    private OffsetDateTime createdTime;
+
     @Column
     @Enumerated(EnumType.STRING)
     @NotNull
@@ -187,6 +191,14 @@ public class Course {
         this.courseState = courseState;
     }
 
+    public OffsetDateTime getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(OffsetDateTime createdTime) {
+        this.createdTime = createdTime;
+    }
+
     @Override
     public String toString() {
         return "Course{" +
@@ -198,11 +210,12 @@ public class Course {
                 ", description='" + description + '\'' +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +
-                ", InvitationCoder='" + invitationCode + '\'' +
+                ", invitationCode='" + invitationCode + '\'' +
                 ", moocUrl='" + moocUrl + '\'' +
                 ", evalId=" + evalId +
                 ", coderId=" + coderId +
                 ", helperId=" + helperId +
+                ", createdTime=" + createdTime +
                 ", courseState=" + courseState +
                 '}';
     }

+ 2 - 0
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/mapper/impl/CourseMapperImpl.java

@@ -42,6 +42,7 @@ public class CourseMapperImpl implements CourseMapper {
         courseVO.setEvalId(course.getEvalId());
         courseVO.setCoderId(course.getCoderId());
         courseVO.setHelperId(course.getHelperId());
+        courseVO.setCreatedTime(course.getCreatedTime());
         courseVO.setCourseState(course.getCourseState());
 
         return courseVO;
@@ -68,6 +69,7 @@ public class CourseMapperImpl implements CourseMapper {
         course.setEvalId(courseVO.getEvalId());
         course.setCoderId(courseVO.getCoderId());
         course.setHelperId(courseVO.getHelperId());
+        course.setCreatedTime(courseVO.getCreatedTime());
         course.setCourseState(courseVO.getCourseState());
 
         return course;

+ 0 - 2
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/repository/CourseRepository.java

@@ -9,7 +9,5 @@ import java.util.Optional;
 public interface CourseRepository extends JpaRepository<Course, Long> {
     List<Course> findCoursesByTeacherId(Long teacherId);
 
-    Optional<Course> findCourseByInvitationCode(String invitationCode);
-
     Optional<Course> findCourseByName(String name);
 }

+ 6 - 8
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/CourseService.java

@@ -62,14 +62,12 @@ public class CourseService {
         return courseMapper.courseToCourseVO(result);
     }
 
-    public String deleteCourse(Long courseId) {
-        Optional<Course> course = courseRepository.findById(courseId);
-        if (course.isPresent()) {
-            courseRepository.deleteById(courseId);
-            return "课程删除成功";
-        } else {
-            return "该课程不存在";
-        }
+    // 伪删除
+    public String deleteCourse(Long courseId){
+        Course course = courseRepository.findById(courseId).get();
+        course.setCourseState(CourseState.DELETED);
+        courseRepository.save(course);
+        return "课程删除成功";
     }
 
     public List<CourseVO> getAllCourses() {