From d0f887fca70b4eb44cb001f32b9c8a07add76b8a Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Fri, 4 Nov 2022 15:57:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9F=B1=E7=8A=B6=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StatisticalAnalysisService.java | 30 ++++++++++++++++--- .../web/StatisticalAnalysisController.java | 12 +++++++- 2 files changed, 37 insertions(+), 5 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 432e80b8..2bac39f9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java @@ -1,17 +1,17 @@ package com.ibeetl.jlw.service; import com.ibeetl.jlw.dao.StatisticalAnalysisDao; +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 org.beetl.sql.core.query.LambdaQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** * 统计分析service @@ -32,6 +32,7 @@ public class StatisticalAnalysisService { @Autowired private TeacherService teacherService; @Autowired private CourseInfoService courseInfoService; @Autowired private ResourcesApplicationService resourcesApplicationService; + @Autowired private UniversitiesCollegesDao universitiesCollegesDao; /** * 统计分析 @@ -150,4 +151,25 @@ public class StatisticalAnalysisService { data.put("exerciseNumber", studentList.size()); return data; } + + public Map adminIndexBarchart(Date stime, Date etime) { + + LambdaQuery lambdaQuery = universitiesCollegesDao.createLambdaQuery(); + if (stime != null && etime != null) { + lambdaQuery.andBetween(UniversitiesColleges::getAddTime, stime, etime); + } + List universitiesColleges = lambdaQuery.select(); + Map collect = universitiesColleges.stream().collect(Collectors.groupingBy(UniversitiesColleges::getUniversitiesCollegesProvince, Collectors.counting())); + List xList = new ArrayList<>(); + List yList = new ArrayList<>(); + + collect.forEach((x,y) -> { + xList.add(x); + yList.add(y); + }); + Map map = new HashMap<>(); + map.put("xList" , xList); + map.put("yList" , yList); + return map; + } } \ No newline at end of file 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 885c6b57..d10e342b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java @@ -52,9 +52,19 @@ public class StatisticalAnalysisController { * 管理员端首页查询 */ @RequestMapping("/adminIndexDetail.do") - public JsonResult adminIndexDetail(@RequestParam("stime") Date stime, @RequestParam("etime") Date etime) { + public JsonResult adminIndexDetail(@RequestParam(value = "stime", required = false) Date stime, @RequestParam(value = "etime", required = false) Date etime) { Map detail = statisticalAnalysisService.adminIndexDetail(stime, etime); return JsonResult.success(detail); } + /** + * 柱状图 + */ + @RequestMapping("/adminIndexBarchart.do") + public JsonResult adminIndexBarchart(@RequestParam(value = "stime", required = false) Date stime, @RequestParam(value = "etime", required = false) Date etime) { + Map detail = statisticalAnalysisService.adminIndexBarchart(stime, etime); + return JsonResult.success(detail); + } + + } \ No newline at end of file