From a7a72bcfc0aab1635892ec008c968fa1ab7d444f Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Tue, 25 Jul 2023 18:23:25 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=BC=80=E8=AF=BE=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=BC=96=E7=A0=81=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=202=E3=80=81=E9=A6=96=E9=A1=B5=E4=B8=8D=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StatisticalAnalysisService.java | 77 ++++++++++++++----- .../jlw/service/TeacherOpenCourseService.java | 3 +- 2 files changed, 59 insertions(+), 21 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java index 37edf6ca..af12703f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -1,6 +1,5 @@ package com.ibeetl.jlw.service; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -16,11 +15,15 @@ import com.ibeetl.jlw.dao.UniversitiesCollegesJurisdictionExperimentalSystemDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.vo.StudentLogAnalysisVO; import com.ibeetl.jlw.entity.vo.StudentLoginLogVO; -import com.ibeetl.jlw.enums.*; +import com.ibeetl.jlw.enums.ChatLogSendTypeEnum; +import com.ibeetl.jlw.enums.GlobalPushStatusEnum; +import com.ibeetl.jlw.enums.GlobalUpStatusEnum; +import com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum; import com.ibeetl.jlw.web.query.*; import org.apache.commons.lang3.StringUtils; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.core.query.LambdaQuery; +import org.beetl.sql.core.query.Query; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -457,8 +460,10 @@ public class StatisticalAnalysisService { } public Map adminIndexDetail(Date stime, Date etime, UniversitiesColleges universitiesColleges, CoreUser coreUser) { - Date startTime = DateUtil.beginOfDay(new Date()); - Date endTime = DateUtil.endOfDay(new Date()); +// Date startTime = DateUtil.beginOfDay(new Date()); +// Date endTime = DateUtil.endOfDay(new Date()); + Date startTime = null; + Date endTime = null; if (!Objects.isNull(stime)) { startTime = DateUtil.beginOfDay(stime); } @@ -507,8 +512,12 @@ public class StatisticalAnalysisService { // long loginDistinctCount = loginDistinctCountQuery.count(); StudentLoginLogQuery condition = new StudentLoginLogQuery(); - condition.setLoginStartTime(startTime); - condition.setLoginEndTime(endTime); + if (ObjectUtil.isNotEmpty(startTime)){ + condition.setLoginStartTime(startTime); + } + if (ObjectUtil.isNotEmpty(endTime)){ + condition.setLoginEndTime(endTime); + } condition.setLoginPath(ResponseControllerAdvice.LOGIN_URL); condition.setLogoutPath(KeyExpiredListener.TOKEN_EXPIRED_MESSAGE); UniversitiesColleges uniAdmin = getUniAdmin(); @@ -532,8 +541,12 @@ public class StatisticalAnalysisService { // List theoryCourseList = universitiesCollegesJurisdictionCurriculumResourcesService.getResourcesCourseInfoAuthDetails(orgId).getTheoryCourseList(); TeacherOpenCourseQuery teacherOpenCourseQuery = new TeacherOpenCourseQuery(); - teacherOpenCourseQuery.setFilterStartTime(startTime); - teacherOpenCourseQuery.setFilterEndTime(endTime); + if (ObjectUtil.isNotEmpty(startTime)){ + teacherOpenCourseQuery.setFilterStartTime(startTime); + } + if (ObjectUtil.isNotEmpty(endTime)){ + teacherOpenCourseQuery.setFilterEndTime(endTime); + } List teacherOpenCourseMergeCourseInfo = teacherOpenCourseService.getTeacherOpenCourseMergeCourseInfo(teacherOpenCourseQuery, coreUser); data.put("courseNumber", teacherOpenCourseMergeCourseInfo.size()); @@ -563,8 +576,12 @@ public class StatisticalAnalysisService { } teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingPushStatus(GlobalPushStatusEnum.PUSH); teacherOpenCourseQuestionSettingQuery.setTeacherOpenCourseQuestionSettingStatus(1); - teacherOpenCourseQuestionSettingQuery.setStartTime(startTime); - teacherOpenCourseQuestionSettingQuery.setEndTime(endTime); + if (ObjectUtil.isNotEmpty(startTime)){ + teacherOpenCourseQuestionSettingQuery.setStartTime(startTime); + } + if (ObjectUtil.isNotEmpty(endTime)){ + teacherOpenCourseQuestionSettingQuery.setEndTime(endTime); + } List courseQuestionSettings = teacherOpenCourseQuestionSettingDao.getValuesByQueryNotWithPermission2(teacherOpenCourseQuestionSettingQuery); // 学生做题：读取【文档存档】中所有课程的【章节】、【课程实操】、【作业—题库作业】、【考试】，这几个模块的任务数量 @@ -579,8 +596,12 @@ public class StatisticalAnalysisService { //课件学习 TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); tasksQuery.setTeacherOpenCourseIdPlural(CollectionUtil.join(collect11, ",")); - tasksQuery.setStartTime(startTime); - tasksQuery.setEndTime(endTime); + if (ObjectUtil.isNotEmpty(startTime)){ + tasksQuery.setStartTime(startTime); + } + if (ObjectUtil.isNotEmpty(endTime)){ + tasksQuery.setEndTime(endTime); + } if (orgId != 1) { tasksQuery.setOrgId(orgId); } @@ -597,9 +618,11 @@ public class StatisticalAnalysisService { if (uniOrgId != null && uniOrgId != 1) { lambdaQuery2.andEq(CoreUser::getOrgId, uniOrgId); } + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ + lambdaQuery2.andBetween(CoreUser::getCreateTime, startTime, endTime); + } int size = lambdaQuery2.andEq(CoreUser::getDelFlag, DelFlagEnum.NORMAL.getValue()) .andNotEq(CoreUser::getId, 1) - .andBetween(CoreUser::getCreateTime, startTime, endTime) .select().size(); data.put("userNumber", size); //案例数量 @@ -607,22 +630,28 @@ public class StatisticalAnalysisService { if (uniOrgId != null && uniOrgId != 1) { lambdaQuery3.andEq(HandsOn::getOrgId, uniOrgId); } + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ + lambdaQuery3.andBetween(HandsOn::getAddTime, startTime, endTime); + } int values = lambdaQuery3.andEq(HandsOn::getHandsOnStatus, 1) - .andBetween(HandsOn::getAddTime, startTime, endTime) .select().size(); LambdaQuery lambdaQuery4 = resourcesTrainingService.createLambdaQuery(); if (uniOrgId != null && uniOrgId != 1) { lambdaQuery4.andEq(ResourcesTraining::getOrgId, uniOrgId); } + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ + lambdaQuery4.andBetween(ResourcesTraining::getAddTime, startTime, endTime); + } int values2 = lambdaQuery4.andEq(ResourcesTraining::getResourcesTrainingStatus, 1) - .andBetween(ResourcesTraining::getAddTime, startTime, endTime) .select().size(); LambdaQuery lambdaQuery5 = resourcesCompetitionService.createLambdaQuery(); if (uniOrgId != null && uniOrgId != 1) { lambdaQuery5.andEq(ResourcesCompetition::getOrgId, uniOrgId); } + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ + lambdaQuery5.andBetween(ResourcesCompetition::getAddTime, startTime, endTime); + } int values3 = lambdaQuery5.andEq(ResourcesCompetition::getResourcesCompetitionStatus, 1) - .andBetween(ResourcesCompetition::getAddTime, startTime, endTime) .select().size(); data.put("caseNumber", values + values2 + values3); //视频数量 @@ -641,8 +670,12 @@ public class StatisticalAnalysisService { if (uniOrgId != null && uniOrgId != 1) { paras1.setOrgId(uniOrgId); } - paras1.setStartTime(startTime); - paras1.setEndTime(endTime); + if (ObjectUtil.isNotEmpty(startTime)){ + paras1.setStartTime(startTime); + } + if (ObjectUtil.isNotEmpty(endTime)){ + paras1.setEndTime(endTime); + } List questionList = resourcesQuestionService.getValues(paras1); data.put("questionNumber", questionList.size()); //院校数量 @@ -651,8 +684,12 @@ public class StatisticalAnalysisService { if (uniOrgId != null && uniOrgId != 1) { paras.setOrgId(uniOrgId); } - paras.setStartTime(startTime); - paras.setEndTime(endTime); + if (ObjectUtil.isNotEmpty(startTime)){ + paras.setStartTime(startTime); + } + if (ObjectUtil.isNotEmpty(endTime)){ + paras.setEndTime(endTime); + } List schoolList = universitiesCollegesService.getValues(paras); data.put("schoolNumber", schoolList.size()); return data; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java index 02cea8db..524da13f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java @@ -1,5 +1,6 @@ package com.ibeetl.jlw.service; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; import cn.jlw.util.ToolUtils; @@ -188,7 +189,7 @@ public class TeacherOpenCourseService extends CoreBaseService TeacherOpenCourse teacherOpenCourse = teacherOpenCourseQuery.pojo(); teacherOpenCourse.setCreateTime(new Date()); teacherOpenCourse.setTeacherOpenCourseStatus(1); - + teacherOpenCourse.setTeacherOpenCourseCode(String.valueOf(System.currentTimeMillis())); teacherOpenCourseDao.insert(teacherOpenCourse); // 开课和教师关联数据