diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/util/HttpRequestLocal.java b/admin-core/src/main/java/com/ibeetl/admin/core/util/HttpRequestLocal.java index dd2683ec..b3ad3365 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/util/HttpRequestLocal.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/util/HttpRequestLocal.java @@ -97,7 +97,7 @@ public class HttpRequestLocal { }); String currentThreadInfo = Thread.currentThread().getName() + "@" + Thread.currentThread().getId(); - log.info(currentThreadInfo + " 读取到redis中的session数量：{}，写入到java内存中", keys.size()); + log.info(currentThreadInfo + " 从redis中读取session到java内存中，数量：{}", keys.size()); }); } diff --git a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java index bf2f694c..e0ce1697 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/ResourcesQuestionDao.java @@ -10,7 +10,6 @@ import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; -import org.beetl.sql.mapper.annotation.Param; import org.beetl.sql.mapper.annotation.SqlResource; import org.beetl.sql.mapper.annotation.Update; import org.springframework.stereotype.Repository; @@ -35,10 +34,9 @@ public interface ResourcesQuestionDao extends BaseMapper{ /** * 根据课程ID获取下面的题目类型和类型下的总题数 * @param courseInfoQuery - * @param courseLabelTypePlural * @return */ - List getGroupQuestionTypeCount(CourseInfoQuery courseInfoQuery, @Param("courseLabelTypePlural") String courseLabelTypePlural); + List getGroupQuestionTypeCount(CourseInfoQuery courseInfoQuery); int checkUnique(ResourcesQuestion question); diff --git a/web/src/main/java/com/ibeetl/jlw/job/UpdateAuthApplicationAndResourcesJob.java b/web/src/main/java/com/ibeetl/jlw/job/UpdateAuthApplicationAndResourcesJob.java index 81e1b871..7daea33d 100644 --- a/web/src/main/java/com/ibeetl/jlw/job/UpdateAuthApplicationAndResourcesJob.java +++ b/web/src/main/java/com/ibeetl/jlw/job/UpdateAuthApplicationAndResourcesJob.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.job; +import cn.hutool.core.collection.CollUtil; import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionCurriculumResourcesDao; import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao; import com.ibeetl.jlw.entity.UniversitiesCollegesJurisdictionCurriculumResources; @@ -59,8 +60,9 @@ public class UpdateAuthApplicationAndResourcesJob implements Job { }).collect(Collectors.toList()); universitiesCollegesJurisdictionCurriculumResourcesService.updateBatchTemplate(resourcesUpdateList); - log.info("已更新授权课程列表：{}", listJoin(resourcesUpdateList, UniversitiesCollegesJurisdictionCurriculumResources::getUniversitiesCollegesJurisdictionCurriculumResourcesId)); - + if (CollUtil.isNotEmpty(resourcesUpdateList)) { + log.info("已更新授权课程列表：{}", listJoin(resourcesUpdateList, UniversitiesCollegesJurisdictionCurriculumResources::getUniversitiesCollegesJurisdictionCurriculumResourcesId)); + } List systemUpdateList = experimentSystemsAllOverdueAuth.stream().map(item -> { UniversitiesCollegesJurisdictionExperimentalSystem o = new UniversitiesCollegesJurisdictionExperimentalSystem(); @@ -70,7 +72,9 @@ public class UpdateAuthApplicationAndResourcesJob implements Job { }).collect(Collectors.toList()); universitiesCollegesJurisdictionExperimentalSystemService.updateBatchTemplate(systemUpdateList); - log.info("已更新授权应用列表：{}", listJoin(systemUpdateList, UniversitiesCollegesJurisdictionExperimentalSystem::getUniversitiesCollegesJurisdictionExperimentalSystemId)); + if (CollUtil.isNotEmpty(systemUpdateList)) { + log.info("已更新授权应用列表：{}", listJoin(systemUpdateList, UniversitiesCollegesJurisdictionExperimentalSystem::getUniversitiesCollegesJurisdictionExperimentalSystemId)); + } }catch (Exception e){ e.printStackTrace(); diff --git a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java index 0efc7fda..6df588c8 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/ResourcesQuestionService.java @@ -790,19 +790,20 @@ public class ResourcesQuestionService extends CoreBaseService * @return */ public List getGroupQuestionTypeCount(CourseInfoQuery courseInfoQuery) { - List g = resourcesQuestionDao.getGroupQuestionTypeCount(courseInfoQuery, null); + List g = resourcesQuestionDao.getGroupQuestionTypeCount(courseInfoQuery); dictParser(g); return g; } /** * 根据机构ids和课程分类查询题目类型对应的数量 - * @param orgIdPlural - * @param courseLabelTypePlural + * @param courseInfoQuery * @return */ public List getQuestionTypeGroupInfoByOrgIdsAndCourseLabelTypes(CourseInfoQuery courseInfoQuery, String courseLabelTypePlural) { - List g = resourcesQuestionDao.getGroupQuestionTypeCount(courseInfoQuery, courseLabelTypePlural); + courseInfoQuery.setCourseLabelTypes(courseLabelTypePlural); + courseInfoQuery.setCourseInfoStatus(1); + List g = resourcesQuestionDao.getGroupQuestionTypeCount(courseInfoQuery); dictParser(g); return g; } diff --git a/web/src/main/resources/sql/jlw/resourcesQuestion.md b/web/src/main/resources/sql/jlw/resourcesQuestion.md index ffe08ee3..c364b673 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestion.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestion.md @@ -384,70 +384,66 @@ getGroupQuestionTypeCount AND ta.course_info_status = 1 AND t.question_status = 1 AND tb.course_label_status = 1 - @if(!isEmpty(courseLabelTypePlural)){ - and find_in_set(tb.course_label_type, #courseLabelTypePlural#) - @} @if(!isEmpty(resourcesQuestionIds)){ and find_in_set(t.resources_question_id,#resourcesQuestionIds#) @} - @if(!isEmpty(resourcesQuestionId)){ - and t.resources_question_id =#resourcesQuestionId# - @} - @if(!isEmpty(courseInfoIds)){ - and find_in_set(t.course_info_id,#courseInfoIds#) + @if(!isEmpty(courseInfoIdPlural)){ + and ta.course_info_full_id regexp #sputil.joinEx(@java.util.Arrays.asList(strUtil.splitToArray(courseInfoIdPlural, ',')), '|', '_', '_')# @} @if(!isEmpty(courseInfoId)){ - and t.course_info_id =#courseInfoId# + and ta.course_info_full_id regexp #'_' + courseInfoId + '_'# + @} + @if(!isEmpty(courseInfoFullId)){ + and ta.course_info_full_id =#courseInfoFullId# + @} + @if(!isEmpty(courseInfoName)){ + and ta.course_info_name like #'%'+courseInfoName+'%'# + @} + @if(!isEmpty(courseInfoThumbnail)){ + and ta.course_info_thumbnail =#courseInfoThumbnail# @} - @if(!isEmpty(questionType)){ - and t.question_type =#questionType# + @if(!isEmpty(courseLabelId)){ + and ta.course_label_id =#courseLabelId# @} - @if(!isEmpty(questionStatus)){ - and t.question_status =#questionStatus# + @if(!isEmpty(courseLabelType)){ + and tb.course_label_type like #'%'+courseLabelType+'%'# @} - @if(!isEmpty(questionScore)){ - and t.question_score =#questionScore# + @if(!isEmpty(courseLabelTypes)){ + and find_in_set(tb.course_label_type, #courseLabelTypes#) @} - @if(!isEmpty(questionStem)){ - and t.question_stem = #questionStem# + @if(!isEmpty(courseInfoBasicsCount)){ + and ta.course_info_basics_count =#courseInfoBasicsCount# @} - @if(!isEmpty(questionOptionA)){ - and t.question_option_a =#questionOptionA# + @if(!isEmpty(courseInfoContent)){ + and ta.course_info_content =#courseInfoContent# @} - @if(!isEmpty(questionOptionB)){ - and t.question_option_b =#questionOptionB# + @if(!isEmpty(courseInfoStatus)){ + and ta.course_info_status =#courseInfoStatus# + @}else{ + and ta.course_info_status != 3 @} - @if(!isEmpty(questionOptionC)){ - and t.question_option_c =#questionOptionC# + @if(!isEmpty(courseInfoType)){ + and ta.course_info_type =#courseInfoType# @} - @if(!isEmpty(questionOptionD)){ - and t.question_option_d =#questionOptionD# + @if(!isEmpty(courseInfoParentId)){ + and ta.course_info_parent_id =#courseInfoParentId# @} - @if(!isEmpty(questionOptionE)){ - and t.question_option_e =#questionOptionE# + @if(!isEmpty(courseVideoId)){ + and ta.course_video_id =#courseVideoId# @} - @if(!isEmpty(questionAnswer)){ - and t.question_answer =#questionAnswer# + @if(!isEmpty(courseCoursewareId)){ + and ta.course_courseware_id =#courseCoursewareId# @} - @if(!isEmpty(questionAnalysis)){ - and t.question_analysis =#questionAnalysis# + @if(!isEmpty(courseEnclosureIds)){ + and ta.course_enclosure_ids =#courseEnclosureIds# @} @if(!isEmpty(orgId)){ and t.org_id =#orgId# @} - @if(!isEmpty(orgIdPlural)){ - and find_in_set(ifnull(t.org_id, 1), #orgIdPlural#) - @} @if(!isEmpty(userId)){ and t.user_id =#userId# @} - @if(!isEmpty(addType)){ - and t.add_type =#addType# - @} - GROUP BY - t.question_type - ORDER BY - t.question_type ASC + group by 1 checkUnique ===