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 82a019d3..a20a82b9 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 @@ -50,7 +50,7 @@ public class CacheConfig extends CachingConfigurerSupport { @Bean @Primary - public RedisCacheManager cacheManager(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManager(RedisTemplate redisTemplate) { return create(redisTemplate, ttl); } @@ -62,7 +62,7 @@ public class CacheConfig extends CachingConfigurerSupport { * @return */ @Bean - public RedisCacheManager cacheManager1Day(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManager1Day(RedisTemplate redisTemplate) { return create(redisTemplate, 3600 * 24L); } /** @@ -73,7 +73,7 @@ public class CacheConfig extends CachingConfigurerSupport { * @return */ @Bean - public RedisCacheManager cacheManagerNeverExpire(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManagerNeverExpire(RedisTemplate redisTemplate) { return create(redisTemplate, -1L); } @@ -83,7 +83,7 @@ public class CacheConfig extends CachingConfigurerSupport { * @return */ @Bean - public RedisCacheManager cacheManager1Hour(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManager1Hour(RedisTemplate redisTemplate) { return create(redisTemplate, 3600L); } @@ -93,7 +93,7 @@ public class CacheConfig extends CachingConfigurerSupport { * @return */ @Bean - public RedisCacheManager cacheManager5Second(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManager5Second(RedisTemplate redisTemplate) { return create(redisTemplate, 5L); } /** @@ -102,7 +102,7 @@ public class CacheConfig extends CachingConfigurerSupport { * @return */ @Bean - public RedisCacheManager cacheManager10Second(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManager10Second(RedisTemplate redisTemplate) { return create(redisTemplate, 10L); } /** @@ -111,11 +111,11 @@ public class CacheConfig extends CachingConfigurerSupport { * @return */ @Bean - public RedisCacheManager cacheManager20Second(RedisTemplate redisTemplate) { + public TowLevelCacheManager cacheManager20Second(RedisTemplate redisTemplate) { return create(redisTemplate, 20L); } - private RedisCacheManager create(RedisTemplate redisTemplate, Long ttl) { + private TowLevelCacheManager create(RedisTemplate redisTemplate, Long ttl) { RedisCacheWriter writer = RedisCacheWriter.lockingRedisCacheWriter(redisTemplate.getConnectionFactory()); SerializationPair pair = SerializationPair .fromSerializer(new JdkSerializationRedisSerializer(this.getClass().getClassLoader())); diff --git a/web/src/main/resources/sql/jlw/generalQuestionLog.md b/web/src/main/resources/sql/jlw/generalQuestionLog.md index 883d0424..54619c4a 100644 --- a/web/src/main/resources/sql/jlw/generalQuestionLog.md +++ b/web/src/main/resources/sql/jlw/generalQuestionLog.md @@ -102,7 +102,7 @@ queryByCondition and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -220,7 +220,7 @@ queryByConditionQuery and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -529,7 +529,7 @@ getGeneralQuestionLogValues and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -639,7 +639,7 @@ getValuesByQuery and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -755,7 +755,7 @@ getValuesByQueryNotWithPermission and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -895,7 +895,7 @@ getExcelValues and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -1027,7 +1027,7 @@ getExcelValues and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @@ -1151,7 +1151,7 @@ studentScoreList and t.general_question_log_finish_time =#generalQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md index 38e99e5c..2a55b4d4 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionLog.md @@ -104,7 +104,7 @@ queryByCondition and t.teacher_open_course_question_log_finish_time =#teacherOpenCourseQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(questionLogAddType)){ and tc.question_log_add_type =#questionLogAddType# @@ -238,7 +238,7 @@ queryByConditionQuery and t.teacher_open_course_question_log_finish_time =#teacherOpenCourseQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(questionLogAddType)){ and t.question_log_add_type = #questionLogAddType# @@ -381,7 +381,7 @@ studentScoreList and t.teacher_open_course_question_log_finish_time =#teacherOpenCourseQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(questionLogAddType)){ and tc.teacher_open_course_question_setting_type =#questionLogAddType# @@ -633,7 +633,7 @@ getTeacherOpenCourseQuestionLogValues and t.teacher_open_course_question_log_finish_time =#teacherOpenCourseQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(questionLogAddType)){ and tc.teacher_open_course_question_setting_type =#questionLogAddType# @@ -716,7 +716,7 @@ getValuesByQuery and t.teacher_open_course_question_log_finish_time =#teacherOpenCourseQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(questionLogAddType)){ and tc.teacher_open_course_question_setting_type =#questionLogAddType# @@ -817,7 +817,7 @@ getValuesByQueryNotWithPermission and t.teacher_open_course_question_log_finish_time =#teacherOpenCourseQuestionLogFinishTime# @} @if(!isEmpty(isErrorFavorite)){ - and (t.is_error_favorite =#isErrorFavorite# or t.student_score != t.question_score) + and (t.is_error_favorite =#isErrorFavorite#) @} @if(!isEmpty(questionLogAddType)){ and t.question_log_add_type = #questionLogAddType#