From f12332f2824a9aba74884c8023686ad9dd42d647 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 21 May 2024 18:00:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8C=89=E5=B9=B4=E5=92=8C=E6=8C=89=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/scale/controller/StatisticController.java | 8 ++++---- .../org/dromara/scale/mapper/StatisticMapper.java | 4 ++-- .../org/dromara/scale/service/IStatisticService.java | 4 ++-- .../scale/service/impl/StatisticServiceImpl.java | 11 ++++++----- .../main/resources/mapper/scale/StatisticMapper.xml | 4 ++-- 5 files changed, 16 insertions(+), 15 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 cd57bf8..8c15d73 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 @@ -50,8 +50,8 @@ public class StatisticController extends BaseController { * 获取预警情况统计-整体 */ @GetMapping("/warn/all") - public R getWarn4All() { - return R.ok(statisticService.getWarn4All()); + public R getWarn4All(String select) { + return R.ok(statisticService.getWarn4All(select)); } /** @@ -106,8 +106,8 @@ public class StatisticController extends BaseController { * 获取总预警数 */ @GetMapping("/warn/num") - public R getWarnNum(String select) { - return R.ok(statisticService.getWarnNum(select)); + public R getWarnNum() { + return R.ok(statisticService.getWarnNum()); } /** 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 24027fd..dbcced1 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 @@ -25,11 +25,11 @@ public interface StatisticMapper { List selectStatisticFactor(@Param("batchNo") Long batchNo, @Param("scaleId") Long scaleId); - StatisticWarnVo selectStatisticWarn4All(); + StatisticWarnVo selectStatisticWarn4All(@Param("startTime") String startTime); int selectUserNum(); int selectEvaluationNum(); - int selectWarnNum(@Param("startTime") String startTime); + int selectWarnNum(); int selectInterveneNum(); List selectScalePublishNum(); 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 71ae6e0..3cd526a 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 @@ -24,11 +24,11 @@ public interface IStatisticService { List getFactor4Class(BaseQueryBo query); - StatisticWarnVo getWarn4All(); + StatisticWarnVo getWarn4All(String select); int getUserNum(); int getEvaluationNum(); - int getWarnNum(String select); + int getWarnNum(); int getInterveneNum(); List getScalePublishNum(); List getPublishAndEvaluationNumByGrade(String select); 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 d983b60..91a8bcf 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 @@ -163,8 +163,9 @@ public class StatisticServiceImpl implements IStatisticService { } @Override - public StatisticWarnVo getWarn4All() { - return statisticMapper.selectStatisticWarn4All(); + public StatisticWarnVo getWarn4All(String select) { + String startTime = getStartTimeBySelect(select); + return statisticMapper.selectStatisticWarn4All(startTime); } @Override @@ -178,9 +179,9 @@ public class StatisticServiceImpl implements IStatisticService { } @Override - public int getWarnNum(String select) { - String startTime = getStartTimeBySelect(select); - return statisticMapper.selectWarnNum(startTime); + public int getWarnNum() { + //String startTime = getStartTimeBySelect(select); + return statisticMapper.selectWarnNum(); } @Override 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 2ae1875..1f6d0b7 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 @@ -57,7 +57,8 @@ count(if(sfr.situation = 5, 1, null)) as `majorNum` from sys_evaluation_conclusion ec left join sys_scale_factor_range sfr on sfr.range_id = ec.factor_range_id - where ec.status = 1 + left join sys_evaluation_record er on er.record_id = ec.record_id + where ec.status = 1 and er.create_time >= #{startTime} select count(*) from sys_warn_record - where warn_time >= #{startTime}