From d03daf5234060f44a61168c3adc20705d10d6a52 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 9 Nov 2022 22:50:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/core/conf/CacheConfig.java | 11 +++++++ .../src/main/resources/static/js/common.js | 2 +- ...acherOpenCourseScheduleSessionOptions.java | 2 ++ .../TeacherOpenCourseScheduleSessionTag.java | 2 ++ .../teacherOpenCourseScheduleSession/add.js | 32 +++++++++++++------ 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java index 07eb81ea..713c3df6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java @@ -59,6 +59,17 @@ public class CacheConfig { public RedisCacheManager cacheManager1Day(RedisTemplate redisTemplate) { return create(redisTemplate, 3600 * 24L); } + /** + * 永不过期的 + * + * @Cacheable(value = {"product"},key = "#root.args[0]",cacheManager = "cacheManagerNeverExpire") // 永不过期的 + * @param redisTemplate + * @return + */ + @Bean + public RedisCacheManager cacheManagerNeverExpire(RedisTemplate redisTemplate) { + return create(redisTemplate, -1L); + } /** * 过期时间一小时 diff --git a/admin-core/src/main/resources/static/js/common.js b/admin-core/src/main/resources/static/js/common.js index f95a1930..141302ea 100644 --- a/admin-core/src/main/resources/static/js/common.js +++ b/admin-core/src/main/resources/static/js/common.js @@ -179,7 +179,7 @@ var Common = { if (next != null) { next(rsp.data); } else { - Common.success(rsp.responseJSON.msg); + Common.success(rsp.msg || rsp.responseJSON.msg); } } }, diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java index 5de42394..857ed7ff 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionOptions.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.ibeetl.admin.core.util.ValidateConfig; import lombok.Data; import lombok.Getter; @@ -21,6 +22,7 @@ import static org.springframework.format.annotation.DateTimeFormat.ISO.DATE; @Data @Accessors(chain = true) @SuppressWarnings("ALL") +@JsonIgnoreProperties(ignoreUnknown = true) public class TeacherOpenCourseScheduleSessionOptions { @NotNull(message = "排课配置ID不能为空！", groups =ValidateConfig.UPDATE.class) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java index f77a1642..e43080b5 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.entity; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import org.beetl.sql.annotation.entity.AssignID; @@ -11,6 +12,7 @@ import java.util.Date; * 课程开课-开课节次-标签 * gen by Spring Boot2 Admin 2022-09-10 */ +@JsonIgnoreProperties(ignoreUnknown = true) public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ //课程开课-课次标签ID diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js index 86a97401..f31bff0c 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js @@ -14,6 +14,12 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule classData.forEach(function (item, index) { classSelectData[index] = {name: item.className, value: item.classId, selected: false} }); + // 是否多个教室 + var isMultipleSessionClass = function() { + return $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val() + } + + var currentTableCache = function() {return table.cache['kkJieciTable']}; /*班级下拉多选*/ var demo1 = xmSelect.render({ @@ -145,16 +151,22 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule }); form.on('select(select_)', function (obj) { - debugger - table.cache['kkJieciTable'][$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value; - var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val(); + // table.cache['kkJieciTable'][$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value; + // var teacherOpenCourseScheduleSessionClassIsMultiple = $("#addForm input:radio[name='teacherOpenCourseScheduleSessionClassIsMultiple']:checked").val(); // if (teacherOpenCourseScheduleSessionClassIsMultiple == 'false') { - kkJieciTableData.forEach(function (item, index) { - if(item.LAY_CHECKED === true) { + // kkJieciTableData.forEach(function (item, index) { + // item.teacherOpenCourseScheduleSessionClassId = obj.value; + // }); + // } + if(isMultipleSessionClass() === 'false') { + currentTableCache().forEach(function (item, index) { + if (item.LAY_CHECKED === true) { item.teacherOpenCourseScheduleSessionClassId = obj.value; } }); - // } + }else { + currentTableCache()[$(this).parents("tr").data("index")].teacherOpenCourseScheduleSessionClassId = obj.value; + } }); //设置时间弹窗 $("#setTime").click(function () { @@ -378,13 +390,13 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule // 构建后台所需要的开课节次List数据 var sessionTagListMap = {}; - kkJieciTableData.forEach(item => { + currentTableCache().forEach(item => { var sessionClassId = item.teacherOpenCourseScheduleSessionClassId if(!sessionClassId) { return; } if(sessionTagListMap.hasOwnProperty(sessionClassId)) { sessionTagListMap[sessionClassId].push(item) }else { - sessionTagListMap[sessionClassId] = [] + (sessionTagListMap[sessionClassId] = []).push(item) } }) var param = { @@ -392,8 +404,8 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule teacherOpenCourseId: teacherOpenCourseId, teacherId: teacherId, schoolClassIdPlural: schoolClassIds, - teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple, - sessionTagList: sessionTagListMap, + // teacherOpenCourseScheduleSessionClassIsMultiple: teacherOpenCourseScheduleSessionClassIsMultiple, + sessionClassList: sessionTagListMap, startTime: teacherOpenCourseScheduleSessionDayTime, weekNum: teacherOpenCourseScheduleSessionWeekNum, openOnHolidays: teacherOpenCourseScheduleSessionOpenOnHolidays,