diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index 35555319..63e54340 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -772,13 +772,15 @@ public class CourseInfoService extends CoreBaseService<CourseInfo>{ return titleLvl; } - public List<CourseInfo> getCourseInfoByStimeAndEtime(Date stime, Date etime) { + public List<CourseInfo> getCourseInfoByStimeAndEtime(Date stime, Date etime, String universitiesCollegesId) { LambdaQuery<CourseInfo> lambdaQuery = courseInfoDao.createLambdaQuery(); if (stime != null && etime != null) { - List<CourseInfo> select = lambdaQuery.andBetween(CourseInfo::getAddTime, stime, etime) - .andEq(CourseInfo::getCourseInfoStatus, 1).select(); - return select; + lambdaQuery.andBetween(CourseInfo::getAddTime, stime, etime) + .andEq(CourseInfo::getCourseInfoStatus, 1); } +// if (universitiesCollegesId != null) { +// lambdaQuery.andEq(CourseInfo::get) +// } return lambdaQuery.andEq(CourseInfo::getCourseInfoStatus, 1).select(); } 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 57dd60fb..9774153a 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -1,12 +1,12 @@ package com.ibeetl.jlw.service; +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.jlw.dao.StatisticalAnalysisDao; import com.ibeetl.jlw.dao.SysLogDao; import com.ibeetl.jlw.dao.UniversitiesCollegesDao; import com.ibeetl.jlw.entity.*; -import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeSchoolClassQuery; -import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery; -import com.ibeetl.jlw.web.query.TeacherOpenCourseNoticeQuery; +import com.ibeetl.jlw.web.query.*; import org.beetl.sql.core.query.LambdaQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -37,6 +37,11 @@ public class StatisticalAnalysisService { @Autowired private ResourcesApplicationService resourcesApplicationService; @Autowired private UniversitiesCollegesDao universitiesCollegesDao; @Autowired private SysLogDao sysLogDao; + @Autowired private UniversitiesCollegesService universitiesCollegesService; + @Autowired private CoreUserService coreUserService; + @Autowired private ResourcesTrainingService resourcesTrainingService; + @Autowired private ResourcesInfoService resourcesInfoService; + @Autowired private ResourcesQuestionService resourcesQuestionService; private static final String PATTERN = "(?<=\"code\":\\[\").*?(?=\"\\],)"; Pattern r = Pattern.compile(PATTERN); @@ -132,13 +137,13 @@ public class StatisticalAnalysisService { return data; } - public Map<String, Object> adminIndexDetail(Date stime, Date etime) { - List<Student> studentList = studentService.getStudentByStimeAndEtime(stime, etime); + public Map<String, Object> adminIndexDetail(Date stime, Date etime, String universitiesCollegesId) { + List<Student> studentList = studentService.getStudentByStimeAndEtime(stime, etime, universitiesCollegesId); Map<String, Object> data = new HashMap<>(); //注册学生数 data.put("studentNumber", studentList.size()); //注册老师数 - List<Teacher> teachers = teacherService.getTeacherByStimeAndEtime(stime, etime); + List<Teacher> teachers = teacherService.getTeacherByStimeAndEtime(stime, etime, universitiesCollegesId); data.put("teacherNumber", teachers.size()); LambdaQuery<SysLog> logDaoLambdaQuery = sysLogDao.createLambdaQuery(); if (stime != null && etime != null) { @@ -158,7 +163,7 @@ public class StatisticalAnalysisService { //登录人次 data.put("studentPersonTime", sysLogs.size()); //上线课程数 - List<CourseInfo> courseInfoList = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime); + List<CourseInfo> courseInfoList = courseInfoService.getCourseInfoByStimeAndEtime(stime, etime, universitiesCollegesId); data.put("courseNumber", courseInfoList.size()); //上线应用数 List<ResourcesApplication> resourcesApplicationList = resourcesApplicationService.getApplicationByStimeAndEtime(stime, etime); @@ -169,6 +174,26 @@ public class StatisticalAnalysisService { data.put("studyNumber", studentList.size()); //学生做题 data.put("exerciseNumber", studentList.size()); + UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(universitiesCollegesId); + //学校动态码 + data.put("universitiesCollegesAuthCode", universitiesColleges != null ? universitiesColleges.getUniversitiesCollegesAuthCode() : "暂无动态码"); + //注册用户数 + List<CoreUser> coreUserList = coreUserService.getCoreUserList(new CoreUser()); + data.put("userNumber", coreUserList.size()); + //案例数量 + List<ResourcesTraining> values = resourcesTrainingService.getValuesByQuery(new ResourcesTrainingQuery()); + data.put("caseNumber", values.size()); + //视频数量 + ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery(); + resourcesInfoQuery.setResourcesInfoType(1); + List<ResourcesInfo> videoNumber = resourcesInfoService.getValuesByQuery(resourcesInfoQuery); + data.put("videoNumber", videoNumber.size()); + //题库数量 + List<ResourcesQuestion> questionList = resourcesQuestionService.getValuesByQuery(new ResourcesQuestionQuery()); + data.put("questionNumber", questionList.size()); + //院校数量 + List<UniversitiesColleges> schoolList = universitiesCollegesService.getValuesByQuery(new UniversitiesCollegesQuery()); + data.put("schoolNumber", schoolList.size()); return data; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index c8bb93eb..daa0c13b 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -864,12 +864,14 @@ public class StudentService extends CoreBaseService<Student>{ return ret; } - public List<Student> getStudentByStimeAndEtime(Date stime, Date etime) { + public List<Student> getStudentByStimeAndEtime(Date stime, Date etime, String universitiesCollegesId) { LambdaQuery<Student> lambdaQuery = studentDao.createLambdaQuery(); if (stime != null && etime != null) { - List<Student> select = lambdaQuery.andBetween(Student::getAddTime, stime, etime) - .andEq(Student::getStudentStatus, 1).select(); - return select; + lambdaQuery.andBetween(Student::getAddTime, stime, etime) + .andEq(Student::getStudentStatus, 1); + } + if (universitiesCollegesId != null) { + lambdaQuery.andEq(Student::getSchoolClass, universitiesCollegesId); } return lambdaQuery.andEq(Student::getStudentStatus, 1).select(); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index 084b062f..b48a18ee 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -738,10 +738,13 @@ public class TeacherService extends CoreBaseService<Teacher> { .select(); } - public List<Teacher> getTeacherByStimeAndEtime(Date stime, Date etime) { + public List<Teacher> getTeacherByStimeAndEtime(Date stime, Date etime, String universitiesCollegesId) { LambdaQuery<Teacher> lambdaQuery = teacherDao.createLambdaQuery(); if (stime != null && etime != null) { - return lambdaQuery.andBetween(Teacher::getAddTime, stime, etime).andEq(Teacher::getTeacherStatus, 1).select(); + lambdaQuery.andBetween(Teacher::getAddTime, stime, etime).andEq(Teacher::getTeacherStatus, 1); + } + if (universitiesCollegesId != null) { + lambdaQuery.andEq(Teacher::getUniversitiesCollegesId, universitiesCollegesId); } return lambdaQuery.andEq(Teacher::getTeacherStatus, 1).select(); } diff --git a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java index d10e342b..a0161881 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java @@ -50,10 +50,18 @@ public class StatisticalAnalysisController { /** * 管理员端首页查询 + * @param stime 开始时间 + * @param etime 结束时间 + * @param universitiesCollegesId 院校id + * @return */ @RequestMapping("/adminIndexDetail.do") - public JsonResult<Object> adminIndexDetail(@RequestParam(value = "stime", required = false) Date stime, @RequestParam(value = "etime", required = false) Date etime) { - Map<String, Object> detail = statisticalAnalysisService.adminIndexDetail(stime, etime); + public JsonResult<Object> adminIndexDetail(@RequestParam(value = "stime", required = false) Date stime, + @RequestParam(value = "etime", required = false) Date etime, + @RequestParam(value = "etime", required = false) String universitiesCollegesId + + ) { + Map<String, Object> detail = statisticalAnalysisService.adminIndexDetail(stime, etime, universitiesCollegesId); return JsonResult.success(detail); }