diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseChatLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseChatLog.java index 6d177e2d..455f7e44 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseChatLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseChatLog.java @@ -4,6 +4,7 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import lombok.Data; +import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.FetchSql; @@ -18,6 +19,7 @@ import java.util.List; * gen by Spring Boot2 Admin 2022-09-18 */ @Data +@EqualsAndHashCode(callSuper=false) // 递归数据。最多支持1000层级,再深层级的就无法查询了 @Fetch(level=1000) public class TeacherOpenCourseChatLog extends BaseEntity{ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java index a39b607b..037aeb38 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionLog.java @@ -4,6 +4,7 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import lombok.Data; +import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.fetch.annotation.Fetch; @@ -16,6 +17,7 @@ import java.util.Date; * gen by Spring Boot2 Admin 2022-10-05 */ @Data +@EqualsAndHashCode(callSuper=false) @Fetch public class TeacherOpenCourseQuestionLog extends BaseEntity{ diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java index 910186b6..c6aeb21b 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java @@ -8,6 +8,7 @@ import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; import lombok.Data; +import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.FetchSql; @@ -22,6 +23,7 @@ import java.util.List; */ @Fetch @Data +@EqualsAndHashCode(callSuper=false) @SuppressWarnings("ALL") public class TeacherOpenCourseQuestionSetting extends BaseEntity { diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestDetail.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestDetail.java index f2e26185..08794dd7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestDetail.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestDetail.java @@ -1,7 +1,7 @@ package com.ibeetl.jlw.entity; -import com.ibeetl.admin.core.entity.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 教师-我的课程-章节练习列表 @@ -9,7 +9,8 @@ import lombok.Data; * @author mlx */ @Data -public class TeacherOpenCourseQuestionTestDetail extends BaseEntity { +@EqualsAndHashCode(callSuper=false) +public class TeacherOpenCourseQuestionTestDetail { // 章节ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestSimpleInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestSimpleInfo.java index 87ad1dae..70525b71 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestSimpleInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionTestSimpleInfo.java @@ -1,7 +1,7 @@ package com.ibeetl.jlw.entity; -import com.ibeetl.admin.core.entity.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; /** * 教师-我的课程-章节练习列表 @@ -9,7 +9,8 @@ import lombok.Data; * @author mlx */ @Data -public class TeacherOpenCourseQuestionTestSimpleInfo extends BaseEntity{ +@EqualsAndHashCode(callSuper=false) +public class TeacherOpenCourseQuestionTestSimpleInfo { //开课题目配置ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java index e4a731fc..7856c671 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSession.java @@ -5,6 +5,7 @@ import com.ibeetl.admin.core.annotation.DictDeep; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import lombok.Data; +import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.fetch.annotation.Fetch; import org.beetl.sql.fetch.annotation.FetchSql; @@ -19,6 +20,7 @@ import java.util.List; */ @Fetch @Data +@EqualsAndHashCode(callSuper=false) public class TeacherOpenCourseScheduleSession extends BaseEntity{ //课程开课-排课位置ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionSnap.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionSnap.java index b2d52104..d79f3cac 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionSnap.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionSnap.java @@ -9,6 +9,7 @@ import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.jlw.enums.StartStatusEnum; import lombok.Data; +import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; @@ -23,6 +24,7 @@ import static com.ibeetl.jlw.enums.StartStatusEnum.getByCode; * gen by Spring Boot2 Admin 2022-09-21 */ @Data +@EqualsAndHashCode(callSuper=false) public class TeacherOpenCourseScheduleSessionSnap extends BaseEntity{ //课程开课-排课位置ID diff --git a/web/src/main/java/com/ibeetl/jlw/entity/api/CurrentUserInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/api/CurrentUserInfo.java index ee5f7a85..7c7313a7 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/api/CurrentUserInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/api/CurrentUserInfo.java @@ -2,10 +2,7 @@ package com.ibeetl.jlw.entity.api; import com.ibeetl.admin.core.annotation.DictDeep; import com.ibeetl.admin.core.entity.CoreUser; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.Accessors; import org.beetl.sql.core.TailBean; @@ -14,6 +11,7 @@ import org.beetl.sql.core.TailBean; @AllArgsConstructor @Builder @Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) public class CurrentUserInfo extends TailBean { /** diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java index 1842ddd1..11325d41 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java @@ -5,6 +5,7 @@ import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.ResourcesQuestionSnapshot; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -13,6 +14,7 @@ import java.math.BigDecimal; *题目快照查询 */ @Data +@EqualsAndHashCode(callSuper=false) public class ResourcesQuestionSnapshotQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "题目快照ID", display = false) diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java index a35ab0ab..1a87a97d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogQuery.java @@ -4,10 +4,7 @@ import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Query; import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; @@ -22,6 +19,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) public class TeacherOpenCourseQuestionLogQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "学生做题日志ID", display = false) diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogStudentDetailQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogStudentDetailQuery.java index 113acf04..2289147c 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogStudentDetailQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionLogStudentDetailQuery.java @@ -1,10 +1,7 @@ package com.ibeetl.jlw.web.query; import com.ibeetl.admin.core.web.query.PageParam; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.Accessors; import org.springframework.validation.annotation.Validated; @@ -18,6 +15,7 @@ import javax.validation.constraints.NotNull; @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) +@EqualsAndHashCode(callSuper=false) @Validated @SuppressWarnings("ALL") public class TeacherOpenCourseQuestionLogStudentDetailQuery extends PageParam { diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java index 54264fe8..7589d740 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuestionSettingQuery.java @@ -7,6 +7,7 @@ import com.ibeetl.jlw.entity.ResourcesQuestion; import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionSetting; import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -16,6 +17,7 @@ import java.util.Date; *题目配置查询 */ @Data +@EqualsAndHashCode(callSuper=false) public class TeacherOpenCourseQuestionSettingQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "开课题目设置ID", display = false) diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java index 131c2ce6..69ea70bf 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseStudentSigninSettingQuery.java @@ -6,6 +6,7 @@ import com.ibeetl.admin.core.web.query.PageParam; import com.ibeetl.jlw.entity.TeacherOpenCourseStudentSigninSetting; import com.ibeetl.jlw.enums.StartStatusEnum; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -16,6 +17,7 @@ import java.util.Date; *学生签到设置查询 */ @Data +@EqualsAndHashCode(callSuper=false) @SuppressWarnings("ALL") public class TeacherOpenCourseStudentSigninSettingQuery extends PageParam { diff --git a/web/tianzePro_B_Restart.sh b/web/tianzePro_B_Restart.sh index 35470a5a..944083f0 100644 --- a/web/tianzePro_B_Restart.sh +++ b/web/tianzePro_B_Restart.sh @@ -4,7 +4,7 @@ LOG_PATH=/data/logs rm -rf ${HOME_PATH}/web-1.0.jar mkdir -p ${HOME_PATH} -tar zxvf /home/admin/java/group-package.tgz -C ${HOME_PATH} +tar zxvf /home/admin/app/tianzepro-package.tgz -C ${HOME_PATH} ps -ef | grep java | grep yt-group-service | grep -v grep | awk '{print$2}' | xargs kill -9