From eebc4f3ca104700119abc6bf60ff2e9dd644841e Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 21 May 2024 16:57:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0=E6=8C=89?= =?UTF-8?q?=E5=B9=B4=E6=8C=89=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scale/controller/StatisticController.java | 12 +++--- .../dromara/scale/mapper/StatisticMapper.java | 8 ++-- .../scale/service/IStatisticService.java | 6 +-- .../service/impl/StatisticServiceImpl.java | 37 +++++++++++++------ .../mapper/scale/StatisticMapper.xml | 14 +++++-- 5 files changed, 49 insertions(+), 28 deletions(-) diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java index c0d6cb0..cd57bf8 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/StatisticController.java @@ -106,8 +106,8 @@ public class StatisticController extends BaseController { * 获取总预警数 */ @GetMapping("/warn/num") - public R getWarnNum() { - return R.ok(statisticService.getWarnNum()); + public R getWarnNum(String select) { + return R.ok(statisticService.getWarnNum(select)); } /** @@ -130,16 +130,16 @@ public class StatisticController extends BaseController { * 获取年级统计，包含年级下发布次数和测评次数 */ @GetMapping("/grade/publish-evaluation") - public R> getGrade() { - return R.ok(statisticService.getPublishAndEvaluationNumByGrade()); + public R> getGrade(String select) { + return R.ok(statisticService.getPublishAndEvaluationNumByGrade(select)); } /** * 获取年级统计，包含年级下各严重度 */ @GetMapping("/grade/conclusion") - public R> getConclusion() { - return R.ok(statisticService.getConclusion()); + public R> getConclusion(String select) { + return R.ok(statisticService.getConclusion(select)); } /** diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java index 3e186ab..24027fd 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/StatisticMapper.java @@ -29,13 +29,13 @@ public interface StatisticMapper { int selectUserNum(); int selectEvaluationNum(); - int selectWarnNum(); + int selectWarnNum(@Param("startTime") String startTime); int selectInterveneNum(); List selectScalePublishNum(); - List selectPublishNumByGrade(); - List selectEvaluationNumByGrade(); - List selectConclusion(); + List selectPublishNumByGrade(@Param("startTime") String startTime); + List selectEvaluationNumByGrade(@Param("startTime") String startTime); + List selectConclusion(@Param("startTime") String startTime); List selectPublish(); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java index 8a3ac46..71ae6e0 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/IStatisticService.java @@ -28,12 +28,12 @@ public interface IStatisticService { int getUserNum(); int getEvaluationNum(); - int getWarnNum(); + int getWarnNum(String select); int getInterveneNum(); List getScalePublishNum(); - List getPublishAndEvaluationNumByGrade(); + List getPublishAndEvaluationNumByGrade(String select); - List getConclusion(); + List getConclusion(String select); List getPublish(); List getInterveneAndWarnByYear(); diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java index 3b718e1..d983b60 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/StatisticServiceImpl.java @@ -178,8 +178,9 @@ public class StatisticServiceImpl implements IStatisticService { } @Override - public int getWarnNum() { - return statisticMapper.selectWarnNum(); + public int getWarnNum(String select) { + String startTime = getStartTimeBySelect(select); + return statisticMapper.selectWarnNum(startTime); } @Override @@ -193,9 +194,10 @@ public class StatisticServiceImpl implements IStatisticService { } @Override - public List getPublishAndEvaluationNumByGrade() { - List publishNum = statisticMapper.selectPublishNumByGrade(); - List evaluationNum = statisticMapper.selectEvaluationNumByGrade(); + public List getPublishAndEvaluationNumByGrade(String select) { + String startTime = getStartTimeBySelect(select); + List publishNum = statisticMapper.selectPublishNumByGrade(startTime); + List evaluationNum = statisticMapper.selectEvaluationNumByGrade(startTime); for (StatisticNumVo publish : publishNum) { for (StatisticNumVo evaluation : evaluationNum) { if (publish.getName().equals(evaluation.getName())) { @@ -207,8 +209,9 @@ public class StatisticServiceImpl implements IStatisticService { } @Override - public List getConclusion() { - return statisticMapper.selectConclusion(); + public List getConclusion(String select) { + String startTime = getStartTimeBySelect(select); + return statisticMapper.selectConclusion(startTime); } @Override @@ -234,8 +237,8 @@ public class StatisticServiceImpl implements IStatisticService { @Override public List getInterveneAndWarnByMoth() { - String s = DateUtils.dateTimeNow("yyyy"); - String startTime = s + "年01月01日"; + String s = DateUtils.dateTimeNow("yyyy月MM月"); + String startTime = s + "01日"; List warnNum = statisticMapper.selectWarnNumByMonth(startTime); List interveneNum = statisticMapper.selectInterveneNumByMonth(startTime); for (StatisticNumVo intervene : interveneNum) { @@ -257,8 +260,20 @@ public class StatisticServiceImpl implements IStatisticService { @Override public List getEvaluationByMonth() { - String s = DateUtils.dateTimeNow("yyyy"); - String startTime = s + "年01月01日"; + String s = DateUtils.dateTimeNow("yyyy月MM月"); + String startTime = s + "01日"; return statisticMapper.selectEvaluationByMouth(startTime); } + + private String getStartTimeBySelect(String select) { + String startTime = null; + if ("year".equals(select)) { + String s = DateUtils.dateTimeNow("yyyy"); + startTime = s + "-01-01 00:00:00"; + } else if ("month".equals(select)) { + String s = DateUtils.dateTimeNow("yyyy-MM"); + startTime = s + "-01 00:00:00"; + } + return startTime; + } } diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml index a576ef2..2ae1875 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/StatisticMapper.xml @@ -75,6 +75,7 @@