diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java index edb1fcf8..25fb184f 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java @@ -3,6 +3,7 @@ package com.ibeetl.admin.core.dao; import com.ibeetl.admin.core.entity.CoreDict; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; +import org.springframework.cache.annotation.Cacheable; import java.util.List; import java.util.Map; @@ -23,12 +24,14 @@ public interface CoreDictDao extends BaseMapper { List findAllList(String type); //根据表名、字段名查询 主键名和注释 和 字段名和注释 + @Cacheable(value = "core.coreDict:findPkAndValue", key = "#tableName+#columnName") List> findPkAndValue (String tableName, String columnNames); //根据表名、字段名查询 注释 List> findComment (String tableName,String columnNames); //动态表名、字段名查询并包装成coreDict实体 + @Cacheable(value = "core.coreDict:findALlListByTable", key = "#idName+#filedName+#tableCode+#tableName+#params") List findALlListByTable (String idName,String filedName,String tableCode,String tableName,String[] params); /** diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/holidays/HolidaysUtils.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/holidays/HolidaysUtils.java index b7dbf2f5..17db7c49 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/holidays/HolidaysUtils.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/holidays/HolidaysUtils.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; -import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,11 +55,11 @@ public abstract class HolidaysUtils { } String URL1 = String.format(githubHolidaysURL2, year); String URL2 = String.format(githubHolidaysURL1, year); - String defaultResponseStr = HttpUtil.get(URL1); - String secondResponseStr = HttpUtil.get(URL2); - String responseStr = ObjectUtil.defaultIfBlank(defaultResponseStr, secondResponseStr); + String responseStr = HttpUtil.get(URL1); + if (ObjectUtil.isEmpty(responseStr)) { + responseStr = HttpUtil.get(URL2); + } Holidays holidays = JSONObject.parseObject(responseStr, Holidays.class); - log.info("正在从{} 获取节假日列表信息。", Strings.isNotBlank(defaultResponseStr) ? URL1 : URL2); cache.put(year, holidays); return holidays; } diff --git a/httpTest/TeacherOpenCourseScheduleSession.http b/httpTest/TeacherOpenCourseScheduleSession.http index 37611bdd..3c1b8272 100644 --- a/httpTest/TeacherOpenCourseScheduleSession.http +++ b/httpTest/TeacherOpenCourseScheduleSession.http @@ -37,6 +37,39 @@ Cookie: JSESSIONID={{session}} } } +//{ +// "startTime": "2022-10-25", +// "weekNum": "4", +// "openOnHolidays": false, +// "weekDetail": [ +// "T1", +// "T2", +// "T3", +// "T4" +// ], +// "schoolClassIdPlural": "12,13,14,7,9", +// "teacherId": "40", +// "teacherOpenCourseId": "1569699103338831872", +// "sessionClassList": { +// "1568607566282530816": [ +// { +// "teacherOpenCourseScheduleSessionTagName": "第三节", +// "teacherOpenCourseScheduleSessionTagDuration": 40, +// "teacherOpenCourseScheduleSessionTagStartTime": "13:00", +// "teacherOpenCourseScheduleSessionTagEndTime": "13:40" +// } +// ], +// "1568621132431663104": [ +// { +// "teacherOpenCourseScheduleSessionTagName": "第四节", +// "teacherOpenCourseScheduleSessionTagDuration": 60, +// "teacherOpenCourseScheduleSessionTagStartTime": "14:00", +// "teacherOpenCourseScheduleSessionTagEndTime": "15:00" +// } +// ] +// } +//} + ### 排课列表 POST {{baseURL}}/jlw/teacherOpenCourseScheduleSession/groupList.json Content-Type: application/x-www-form-urlencoded diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java index 87a6aa68..002378d7 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java @@ -254,7 +254,7 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService