From 213f4eece2beb129b709b3b515af54ef8b765e6d Mon Sep 17 00:00:00 2001 From: maLix Date: Wed, 17 May 2023 01:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E7=AB=AF=E5=AE=9E=E6=93=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/mysql/2.tianze-pro-update.sql | 3 ++ .../TeacherOpenCourseMergeCourseInfo.java | 11 ++++++ ...acherOpenCourseMergeCourseInfoService.java | 8 +++++ ...TeacherOpenCourseMergeCourseInfoQuery.java | 11 ++++++ web/src/main/resources/sql/jlw/handsOn.md | 36 +++++++++++++++++++ .../templates/jlw/handsOn/index.html | 10 ++++++ web/tianzePro_B_Restart.sh | 2 ++ 7 files changed, 81 insertions(+) diff --git a/doc/sql/mysql/2.tianze-pro-update.sql b/doc/sql/mysql/2.tianze-pro-update.sql index 9e067370..93b5d3ff 100644 --- a/doc/sql/mysql/2.tianze-pro-update.sql +++ b/doc/sql/mysql/2.tianze-pro-update.sql @@ -582,3 +582,6 @@ CREATE TABLE `student_teacher_system_use_log_analysis` ( `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学生教师行为分析'; + + +alter table teacher_open_course_merge_course_info add column system_course_info_id bigint(20) comment '关联系统课程ID' after teacher_open_course_id; \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java index 4a21af36..603dc657 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java @@ -31,6 +31,9 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp private Long teacherOpenCourseId ; + // 系统课程ID + private Long systemCourseInfoId ; + // @UpdateIgnore // @InsertIgnore // @Dict(type="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") @@ -372,4 +375,12 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp public int compareTo(TeacherOpenCourseMergeCourseInfo o) { return this.getTeacherOpenCourseMergeCourseInfoId().compareTo(o.getTeacherOpenCourseMergeCourseInfoId()); } + + public Long getSystemCourseInfoId() { + return systemCourseInfoId; + } + + public void setSystemCourseInfoId(Long systemCourseInfoId) { + this.systemCourseInfoId = systemCourseInfoId; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java index c77eb8d8..e6dab2ed 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java @@ -675,6 +675,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService copyToList = BeanUtil.copyToList(chapterList, TeacherOpenCourseMergeCourseInfo.class, copyOptions); + copyToList.forEach(item -> { + // 这里系统课程ID再拷贝一份 用于记录是从哪个课程拷贝来的。 + // 这里的teacherOpenCourseMergeCourseInfoId 暂存的还是系统课程ID + item.setSystemCourseInfoId(item.getTeacherOpenCourseMergeCourseInfoId()); + }); + result.addAll(copyToList); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java index 38c6ad3a..ca34ea36 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java @@ -20,6 +20,9 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { @Query(name = "开课ID", display = false,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; + @Query(name = "系统课程ID", display = true) + private Long systemCourseInfoId ; + @NotEmpty(message = "章节名称不能为空", groups =ValidateConfig.ADD.class) @Query(name = "课程名称", display = true) private String courseInfoName; @@ -287,4 +290,12 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { public void setInnerJoin(Boolean innerJoin) { this.innerJoin = innerJoin; } + + public Long getSystemCourseInfoId() { + return systemCourseInfoId; + } + + public void setSystemCourseInfoId(Long systemCourseInfoId) { + this.systemCourseInfoId = systemCourseInfoId; + } } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index 878371da..1ed172a1 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -53,6 +53,42 @@ queryByCondition @} +queryByConditionMergeOpenCourseHandsOn +=== +* 查询开课实训和系统级别的实训 + + select + t.`hands_on_id`, + t.`course_info_id`, + t.`course_child_node`, + t.`hands_on_name`, + t.`add_time`, + t.`org_id`, + t.`user_id`, + a.course_info_id, + a.course_info_full_id, + 'ADMIN_ADD' as data_type + from hands_on t + LEFT JOIN course_info a on t.course_info_id = a.course_info_id + union all + select + t.`hands_on_id`, + t.`course_info_id`, + t.`course_child_node`, + t.`hands_on_name`, + t.`add_time`, + t.`org_id`, + t.`user_id`, + a.course_info_id, + a.course_info_full_id, + 'FACULTY_ADD' as data_type + from teacher_open_course_hands_on t + LEFT JOIN course_info a on t.course_info_id = a.course_info_id + LEFT JOIN teacher_open_course_merge_course_info b on b.system_course_info_id = a.course_info_id + + + + queryByConditionQuery === * 根据不为空的参数进行分页查询(无权限) diff --git a/web/src/main/resources/templates/jlw/handsOn/index.html b/web/src/main/resources/templates/jlw/handsOn/index.html index cc05f4fa..84157865 100644 --- a/web/src/main/resources/templates/jlw/handsOn/index.html +++ b/web/src/main/resources/templates/jlw/handsOn/index.html @@ -55,6 +55,16 @@ id="handsOnStatu" name="handsOnStatus"/> + + + + + + + + + +
diff --git a/web/tianzePro_B_Restart.sh b/web/tianzePro_B_Restart.sh index 6b124efc..658a7d47 100644 --- a/web/tianzePro_B_Restart.sh +++ b/web/tianzePro_B_Restart.sh @@ -4,6 +4,8 @@ LOG_PATH=/data/logs rm -rf ${HOME_PATH}/web-1.0.jar mkdir -p ${HOME_PATH} +mkdir -p ${LOG_PATH} + tar zxvf /home/admin/app/tianzepro-package.tgz -C ${HOME_PATH} ps -ef | grep java | grep web | grep -v grep | awk '{print$2}' | xargs kill -9