diff --git a/lib/javax.annotation.jar b/lib/javax.annotation.jar new file mode 100644 index 0000000..52dca7f Binary files /dev/null and b/lib/javax.annotation.jar differ diff --git a/lib/javax.ejb.jar b/lib/javax.ejb.jar new file mode 100644 index 0000000..4ebf5ec Binary files /dev/null and b/lib/javax.ejb.jar differ diff --git a/lib/javax.jms.jar b/lib/javax.jms.jar new file mode 100644 index 0000000..d31451a Binary files /dev/null and b/lib/javax.jms.jar differ diff --git a/lib/javax.persistence.jar b/lib/javax.persistence.jar new file mode 100644 index 0000000..21d80e0 Binary files /dev/null and b/lib/javax.persistence.jar differ diff --git a/lib/javax.resource.jar b/lib/javax.resource.jar new file mode 100644 index 0000000..696a234 Binary files /dev/null and b/lib/javax.resource.jar differ diff --git a/lib/javax.servlet.jar b/lib/javax.servlet.jar new file mode 100644 index 0000000..0519e4a Binary files /dev/null and b/lib/javax.servlet.jar differ diff --git a/lib/javax.servlet.jsp.jar b/lib/javax.servlet.jsp.jar new file mode 100644 index 0000000..9c0631c Binary files /dev/null and b/lib/javax.servlet.jsp.jar differ diff --git a/lib/javax.servlet.jsp.jstl.jar b/lib/javax.servlet.jsp.jstl.jar new file mode 100644 index 0000000..7be17cc Binary files /dev/null and b/lib/javax.servlet.jsp.jstl.jar differ diff --git a/lib/javax.transaction.jar b/lib/javax.transaction.jar new file mode 100644 index 0000000..729c695 Binary files /dev/null and b/lib/javax.transaction.jar differ diff --git a/src/main/java/com/codesdream/ase/model/parent/Excercise.java b/src/main/java/com/codesdream/ase/model/parent/Excercise.java new file mode 100644 index 0000000..ce76faa --- /dev/null +++ b/src/main/java/com/codesdream/ase/model/parent/Excercise.java @@ -0,0 +1,28 @@ +package com.codesdream.ase.model.parent; + +import com.codesdream.ase.model.file.Image; +import lombok.Data; + +import javax.persistence.*; +import java.sql.Time; +import java.util.Date; +import java.util.List; + +@Entity +@Table +@Data +public class Excercise { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + int id; + + // 开始时间 + Date start; + + // 持续时间 + Time duration; + + // 学期 + int term; +} diff --git a/src/main/java/com/codesdream/ase/model/parent/Message.java b/src/main/java/com/codesdream/ase/model/parent/Message.java new file mode 100644 index 0000000..266d92b --- /dev/null +++ b/src/main/java/com/codesdream/ase/model/parent/Message.java @@ -0,0 +1,30 @@ +package com.codesdream.ase.model.parent; + +import com.codesdream.ase.model.file.File; +import com.codesdream.ase.model.mark.Tag; +import com.codesdream.ase.model.permission.User; +import lombok.Data; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Table +@Data +public class Message { + @Id + int id; + + String title; + String text; + Boolean have_read; + + // 重要性 值为0-1 + int type; + + @OneToMany + User Receiver; + +} \ No newline at end of file diff --git a/src/main/java/com/codesdream/ase/model/parent/Parent.java b/src/main/java/com/codesdream/ase/model/parent/Parent.java new file mode 100644 index 0000000..950ea50 --- /dev/null +++ b/src/main/java/com/codesdream/ase/model/parent/Parent.java @@ -0,0 +1,23 @@ +package com.codesdream.ase.model.parent; + +import com.codesdream.ase.model.mark.Tag; +import com.codesdream.ase.model.permission.User; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.annotation.Generated; +import javax.persistence.*; +import java.util.List; + +@Entity +@Table +@Data +@EqualsAndHashCode(callSuper = false) +public class Parent extends User { + @Column(nullable = false) + String parentId; + + @Column(nullable = false) + String name; + +} diff --git a/src/main/java/com/codesdream/ase/model/robot/Faq.java b/src/main/java/com/codesdream/ase/model/robot/Faq.java new file mode 100644 index 0000000..ee28efb --- /dev/null +++ b/src/main/java/com/codesdream/ase/model/robot/Faq.java @@ -0,0 +1,20 @@ +package com.codesdream.ase.model.robot; + +import com.codesdream.ase.model.mark.Tag; +import com.codesdream.ase.model.permission.User; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.annotation.Generated; +import javax.persistence.*; +import java.util.List; + +@Entity +@Table +@Data +public class Faq { + String answer; + String question; + List tag; + +} diff --git a/src/main/java/com/codesdream/ase/model/student/Student.java b/src/main/java/com/codesdream/ase/model/student/Student.java index ddf5385..962bf46 100644 --- a/src/main/java/com/codesdream/ase/model/student/Student.java +++ b/src/main/java/com/codesdream/ase/model/student/Student.java @@ -19,4 +19,8 @@ public class Student extends User { String profilePicture; + @Column(nullable = false) + Boolean is_showgrade; + + } diff --git a/src/main/java/com/codesdream/ase/model/student/StudentCourse.java b/src/main/java/com/codesdream/ase/model/student/StudentCourse.java index 0c1c52e..c82d6d1 100644 --- a/src/main/java/com/codesdream/ase/model/student/StudentCourse.java +++ b/src/main/java/com/codesdream/ase/model/student/StudentCourse.java @@ -22,6 +22,8 @@ public class StudentCourse { @Column(nullable = false) boolean isFailed; + int term; + Date finishedDate; }