From be24c6f7577e6826e9389261cd2dfdc14b16fab3 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 16 Nov 2022 11:32:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=88=AB=E5=90=8D=E7=9A=84=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/core/conf/CacheConfig.java | 20 ++++++-- .../TeacherOpenCourseMergeCourseInfo.java | 50 +++++++------------ 2 files changed, 35 insertions(+), 35 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 f418aeb2..8275831e 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 @@ -3,6 +3,8 @@ package com.ibeetl.admin.core.conf; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cache.Cache; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.interceptor.KeyGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; @@ -34,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; @Configuration @ConditionalOnProperty(name="springext.cache.enabled", havingValue="true" ,matchIfMissing=false) -public class CacheConfig { +public class CacheConfig extends CachingConfigurerSupport { // 定义一个redis 的频道，默认叫cache，用于pub/sub @Value("${springext.cache.redis.topic:cache}") @@ -111,12 +113,24 @@ public class CacheConfig { // Sub 一个消息，通知缓存管理器 String type = new String(bs, StandardCharsets.UTF_8); cacheManager.receiver(type); - } - }); } + @Override + @Bean + public KeyGenerator keyGenerator() { + return (target, method, params) -> { + StringBuilder sb = new StringBuilder(); + sb.append(target.getClass().getName()); + sb.append(method.getName()); + for (Object obj : params) { + sb.append(obj.toString()); + } + return sb.toString(); + }; + } + class TowLevelCacheManager extends RedisCacheManager { RedisTemplate redisTemplate; 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 a0738145..3fb5588e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java @@ -1,13 +1,11 @@ package com.ibeetl.jlw.entity; +import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AutoID; -import org.beetl.sql.annotation.entity.InsertIgnore; -import org.beetl.sql.annotation.entity.UpdateIgnore; import org.beetl.sql.fetch.annotation.Fetch; -import org.beetl.sql.fetch.annotation.FetchSql; import javax.validation.constraints.NotNull; import java.util.List; @@ -28,14 +26,17 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp private Long teacherOpenCourseMergeCourseInfoId ; //开课ID + @Dict(type="teacher_open_course.teacher_open_course_name.teacher_open_course_status=1") + private Long teacherOpenCourseId ; - @UpdateIgnore - @InsertIgnore - @FetchSql("select teacher_open_course_title from teacher_open_course " + - "where teacher_open_course_status = 1 " + - "and teacher_open_course_id = #teacherOpenCourseId# ") - private String teacherOpenCourseIdText; +// @UpdateIgnore +// @InsertIgnore +// @Dict(type="teacher_open_course.teacher_open_course_name.teacher_open_course_status=1") +// @FetchSql("select teacher_open_course_title from teacher_open_course " + +// "where teacher_open_course_status = 1 " + +// "and teacher_open_course_id = #teacherOpenCourseId# ") +// private String teacherOpenCourseIdText; //名称（课程名 或 章名 或 节名） @@ -46,14 +47,16 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp private String courseInfoThumbnail ; //课程标签ID + @Dict(type="course_label.course_label_name.course_label_status=1") + private Long courseLabelId ; - @UpdateIgnore - @InsertIgnore - @FetchSql("select course_label_name from course_label " + - "where course_label_status = 1 " + - "and course_label_id = #courseLabelId# ") - private String courseLabelIdText; +// @UpdateIgnore +// @InsertIgnore +// @FetchSql("select course_label_name from course_label " + +// "where course_label_status = 1 " + +// "and course_label_id = #courseLabelId# ") +// private String courseLabelIdText; //课程学习人数基数 @@ -353,23 +356,6 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp return (List)this.get("children"); } - - public String getTeacherOpenCourseIdText() { - return teacherOpenCourseIdText; - } - - public void setTeacherOpenCourseIdText(String teacherOpenCourseIdText) { - this.teacherOpenCourseIdText = teacherOpenCourseIdText; - } - - public String getCourseLabelIdText() { - return courseLabelIdText; - } - - public void setCourseLabelIdText(String courseLabelIdText) { - this.courseLabelIdText = courseLabelIdText; - } - @Override public int compareTo(TeacherOpenCourseMergeCourseInfo o) { return this.getTeacherOpenCourseMergeCourseInfoId().compareTo(o.getTeacherOpenCourseMergeCourseInfoId());