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 d4d5d9ad..637020f3 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 @@ -87,6 +87,16 @@ public class CacheConfig extends CachingConfigurerSupport { return create(redisTemplate, 3600L); } + /** + * 过期时间5秒 + * @param redisTemplate + * @return + */ + @Bean + public RedisCacheManager cacheManager5Second(RedisTemplate redisTemplate) { + return create(redisTemplate, 5L); + } + private RedisCacheManager create(RedisTemplate redisTemplate, Long ttl) { RedisCacheWriter writer = RedisCacheWriter.lockingRedisCacheWriter(redisTemplate.getConnectionFactory()); SerializationPair pair = SerializationPair 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 afe16c8f..a547040f 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 @@ -31,7 +31,7 @@ public interface CoreDictDao extends BaseMapper { //根据表名、字段名查询 主键名和注释 和 字段名和注释 - @Cacheable(value = DICT_CACHE_FIND_PK_AND_VALUE, key = "#tableName + #columnNames") + @Cacheable(value = DICT_CACHE_FIND_PK_AND_VALUE, key = "#tableName + #columnNames", cacheManager = "cacheManager5Second") List> findPkAndValue (String tableName, String columnNames); //根据表名、字段名查询 注释 @@ -40,7 +40,7 @@ public interface CoreDictDao extends BaseMapper { //动态表名、字段名查询并包装成coreDict实体 - @Cacheable(value = DICT_CACHE_FIND_ALL_LIST_BY_TABLE, key = "#idName + #filedName + #tableCode + #tableName + #params") + @Cacheable(value = DICT_CACHE_FIND_ALL_LIST_BY_TABLE, key = "#idName + #filedName + #tableCode + #tableName + #params", cacheManager = "cacheManager5Second") List findALlListByTable (String idName,String filedName,String tableCode,String tableName,String[] params); /** diff --git a/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java b/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java index 36ba8297..d673ec09 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/UniversityFacultyController.java @@ -125,9 +125,12 @@ public class UniversityFacultyController extends BaseController { ModelAndView view = new ModelAndView("/jlw/universityFaculty/add.html"); if(null != universityFacultyId){ UniversityFaculty universityFaculty = universityFacultyService.queryById(universityFacultyId); + UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(universityFaculty.getOrgId()); + view.addObject("universitiesCollegesInfo", universitiesColleges); view.addObject("universityFaculty", universityFaculty); }else { view.addObject("universityFaculty", new UniversityFaculty()); + view.addObject("universitiesCollegesInfo", new UniversitiesColleges()); } // 如果是学校管理员则查询所在院校的信息 if (coreUser.isUniAdmin()) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java index cd7b449d..d16694fc 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesInfoQuery.java @@ -46,6 +46,9 @@ public class ResourcesInfoQuery extends PageParam { * 全路径查询,用于查询归属课程 */ private String courseInfoFullId; + private String courseInfoId_1; + private String courseInfoId_2; + private String courseInfoId_3; public Long getResourcesInfoId(){ return resourcesInfoId; @@ -169,4 +172,28 @@ public class ResourcesInfoQuery extends PageParam { public void setCourseInfoFullId(String courseInfoFullId) { this.courseInfoFullId = courseInfoFullId; } + + public String getCourseInfoId_1() { + return courseInfoId_1; + } + + public void setCourseInfoId_1(String courseInfoId_1) { + this.courseInfoId_1 = courseInfoId_1; + } + + public String getCourseInfoId_2() { + return courseInfoId_2; + } + + public void setCourseInfoId_2(String courseInfoId_2) { + this.courseInfoId_2 = courseInfoId_2; + } + + public String getCourseInfoId_3() { + return courseInfoId_3; + } + + public void setCourseInfoId_3(String courseInfoId_3) { + this.courseInfoId_3 = courseInfoId_3; + } } diff --git a/web/src/main/resources/sql/jlw/resourcesInfo.md b/web/src/main/resources/sql/jlw/resourcesInfo.md index 54920863..e2218972 100644 --- a/web/src/main/resources/sql/jlw/resourcesInfo.md +++ b/web/src/main/resources/sql/jlw/resourcesInfo.md @@ -51,7 +51,13 @@ queryByCondition @if(!isEmpty(seeSelf) && seeSelf && !isEmpty(userId)){ and (t.add_type = 'ADMIN_ADD' or t.user_id = #userId#) @} - + @if(!isEmpty(courseInfoId_1)){ + and a.course_info_full_id like #courseInfoId_1 + '%'# + @} else if(!isEmpty(courseInfoId_2)){ + and a.course_info_full_id like #courseInfoId_1 + '_' + courseInfoId_2 + '%'# + @} else if(!isEmpty(courseInfoId_3)){ + and a.course_info_full_id like #courseInfoId_1 + '_' + courseInfoId_2 + '_' + courseInfoId_3 + '%'# + @} ORDER BY t.resources_info_id DESC diff --git a/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html b/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html index f1f44fe7..cdd37344 100644 --- a/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html +++ b/web/src/main/resources/templates/jlw/generalQuestionSetting/add.html @@ -113,7 +113,7 @@
diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html index 320e173f..712085f6 100644 --- a/web/src/main/resources/templates/jlw/handsOn/add.html +++ b/web/src/main/resources/templates/jlw/handsOn/add.html @@ -46,7 +46,7 @@
diff --git a/web/src/main/resources/templates/jlw/handsOn/index.html b/web/src/main/resources/templates/jlw/handsOn/index.html index a34bf793..567b8288 100644 --- a/web/src/main/resources/templates/jlw/handsOn/index.html +++ b/web/src/main/resources/templates/jlw/handsOn/index.html @@ -13,7 +13,7 @@
diff --git a/web/src/main/resources/templates/jlw/handsOn/index1.html b/web/src/main/resources/templates/jlw/handsOn/index1.html index 22e9915b..3188df48 100644 --- a/web/src/main/resources/templates/jlw/handsOn/index1.html +++ b/web/src/main/resources/templates/jlw/handsOn/index1.html @@ -4,7 +4,7 @@
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html index 5ed6ceac..7a7ad607 100644 --- a/web/src/main/resources/templates/jlw/resourcesCompetition/add.html +++ b/web/src/main/resources/templates/jlw/resourcesCompetition/add.html @@ -39,7 +39,7 @@
diff --git a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html index 8446a474..c57f9664 100644 --- a/web/src/main/resources/templates/jlw/resourcesCompetition/index.html +++ b/web/src/main/resources/templates/jlw/resourcesCompetition/index.html @@ -13,7 +13,7 @@
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/add.html b/web/src/main/resources/templates/jlw/resourcesInfo/add.html index 4b1e1b04..d499e756 100644 --- a/web/src/main/resources/templates/jlw/resourcesInfo/add.html +++ b/web/src/main/resources/templates/jlw/resourcesInfo/add.html @@ -7,7 +7,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/resourcesInfo/index.html b/web/src/main/resources/templates/jlw/resourcesInfo/index.html index 1d846656..8b7088d3 100644 --- a/web/src/main/resources/templates/jlw/resourcesInfo/index.html +++ b/web/src/main/resources/templates/jlw/resourcesInfo/index.html @@ -41,7 +41,7 @@
@@ -82,7 +82,7 @@
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html index cdcc0e23..693b4d28 100644 --- a/web/src/main/resources/templates/jlw/resourcesQuestion/add.html +++ b/web/src/main/resources/templates/jlw/resourcesQuestion/add.html @@ -8,7 +8,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html index 990188b8..f7f8b5b7 100644 --- a/web/src/main/resources/templates/jlw/resourcesQuestion/index.html +++ b/web/src/main/resources/templates/jlw/resourcesQuestion/index.html @@ -19,7 +19,7 @@
@@ -63,7 +63,7 @@
@@ -91,7 +91,7 @@
diff --git a/web/src/main/resources/templates/jlw/resourcesTraining/add.html b/web/src/main/resources/templates/jlw/resourcesTraining/add.html index db55fc8c..e063d8f2 100644 --- a/web/src/main/resources/templates/jlw/resourcesTraining/add.html +++ b/web/src/main/resources/templates/jlw/resourcesTraining/add.html @@ -38,7 +38,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/resourcesTraining/index.html b/web/src/main/resources/templates/jlw/resourcesTraining/index.html index 036f39a0..20a27f6a 100644 --- a/web/src/main/resources/templates/jlw/resourcesTraining/index.html +++ b/web/src/main/resources/templates/jlw/resourcesTraining/index.html @@ -13,7 +13,7 @@
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseKnowledgePoint/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseKnowledgePoint/add.html index 7a9cc465..9a32cc6a 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseKnowledgePoint/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseKnowledgePoint/add.html @@ -7,7 +7,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html index b4a8bb20..d08a32d0 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreDashboard/add.html @@ -90,7 +90,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreWeight/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreWeight/add.html index f030bebe..7b489b70 100644 --- a/web/src/main/resources/templates/jlw/teacherOpenCourseScoreWeight/add.html +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScoreWeight/add.html @@ -264,7 +264,7 @@
-
diff --git a/web/src/main/resources/templates/jlw/universityFaculty/add.html b/web/src/main/resources/templates/jlw/universityFaculty/add.html index cc34adcc..e1ae33d3 100644 --- a/web/src/main/resources/templates/jlw/universityFaculty/add.html +++ b/web/src/main/resources/templates/jlw/universityFaculty/add.html @@ -8,9 +8,9 @@
- - +
@@ -20,7 +20,7 @@
+ value="${universityFaculty.universityFacultyName!''}" class="layui-input">
@@ -29,7 +29,7 @@
+ value="${universityFaculty.universityFacultyContact!''}" class="layui-input">
@@ -38,7 +38,7 @@
+ value="${universityFaculty.universityFacultyContactTel!''}" class="layui-input">
@@ -48,12 +48,12 @@
+ class="layui-textarea">${universityFaculty.universityFacultyContactAddress!''}
- + diff --git a/web/src/main/resources/templates/jlw/universityFaculty/index.html b/web/src/main/resources/templates/jlw/universityFaculty/index.html index 005a9c03..c0d5a6ed 100644 --- a/web/src/main/resources/templates/jlw/universityFaculty/index.html +++ b/web/src/main/resources/templates/jlw/universityFaculty/index.html @@ -6,7 +6,7 @@ - +
新增