From 391bf01ce794ccbce0ff8024267bd885532f5a1f Mon Sep 17 00:00:00 2001 From: 15683799673 Date: Fri, 5 Sep 2025 18:02:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SisAlarmEventsController.java | 21 ++++++++++++++++ .../sis/domain/vo/QueryStatisticsAlarmVo.java | 25 +++++++++++++++++++ .../sis/mapper/SisAlarmEventsMapper.java | 10 ++++++++ .../sis/service/ISisAlarmEventsService.java | 19 +++++++++++++- .../impl/SisAlarmEventsServiceImpl.java | 12 +++++++++ .../mapper/sis/SisAlarmEventsMapper.xml | 14 +++++++++++ 6 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/QueryStatisticsAlarmVo.java diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventsController.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventsController.java index 3c164ae2..0f3046ae 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventsController.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/controller/SisAlarmEventsController.java @@ -19,6 +19,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.sis.domain.bo.SisAlarmEventsBo; import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo; import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo; +import org.dromara.sis.domain.vo.QueryStatisticsAlarmVo; import org.dromara.sis.domain.vo.SisAlarmEventsVo; import org.dromara.sis.service.ISisAlarmEventsService; import org.dromara.system.api.model.LoginUser; @@ -161,5 +162,25 @@ public class SisAlarmEventsController extends BaseController { return sisAlarmEventsService.queryCurrAssignment(bo, pageQuery); } + /** + * 分类查询当日预警数据 + * + * @return 返回预警统计数据 + */ + @GetMapping("/query/statistics/currDay") + public R> queryStatisticsCurrDay() { + List vo = sisAlarmEventsService.queryStatisticsCurrDay(); + return R.ok(vo); + } + /** + * 分类查询所有的预警信息 + * + * @return 返回预警统计数据 + */ + @GetMapping("/query/statistics") + public R> queryStatistics() { + List vo = sisAlarmEventsService.queryStatistics(); + return R.ok(vo); + } } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/QueryStatisticsAlarmVo.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/QueryStatisticsAlarmVo.java new file mode 100644 index 00000000..794cc646 --- /dev/null +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/QueryStatisticsAlarmVo.java @@ -0,0 +1,25 @@ +package org.dromara.sis.domain.vo; + +import lombok.Data; +import org.dromara.common.translation.annotation.Translation; +import org.dromara.common.translation.constant.TransConstant; + +@Data +public class QueryStatisticsAlarmVo { + + /** + * 预警类型 + */ + private Integer typeCode; + + /** + * 预警类型名称 + */ + @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "typeCode", other = "event_small_type") + private String typeName; + + /** + * 预警总数 + */ + private Integer total; +} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java index 2aee9ab4..c929b4ee 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/mapper/SisAlarmEventsMapper.java @@ -1,9 +1,14 @@ package org.dromara.sis.mapper; +import org.apache.ibatis.annotations.Param; import org.dromara.sis.domain.SisAlarmEvents; +import org.dromara.sis.domain.vo.QueryStatisticsAlarmVo; import org.dromara.sis.domain.vo.SisAlarmEventsVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import java.util.Date; +import java.util.List; + /** * 告警Mapper接口 * @@ -12,4 +17,9 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface SisAlarmEventsMapper extends BaseMapperPlus { + List queryStatisticsCurrDay(@Param("now") Date now); + + List queryStatistics(); + + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java index ec33a236..46f152e2 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/ISisAlarmEventsService.java @@ -7,6 +7,7 @@ import org.dromara.sis.domain.bo.SisAlarmEventsBo; import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo; import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo; import org.dromara.sis.domain.enums.EventSmallTypeEnum; +import org.dromara.sis.domain.vo.QueryStatisticsAlarmVo; import org.dromara.sis.domain.vo.SisAlarmEventsVo; import java.util.Collection; @@ -84,6 +85,7 @@ public interface ISisAlarmEventsService { /** * 任务分配操作 + * * @param bo 分配参数 * @return 返回是否分配成功 */ @@ -91,7 +93,8 @@ public interface ISisAlarmEventsService { /** * 查询当前用户的告警处理任务 - * @param bo 查询参数 + * + * @param bo 查询参数 * @param pageQuery 分页参数 * @return 返回任务列表 */ @@ -99,10 +102,24 @@ public interface ISisAlarmEventsService { /** * 任务完成 + * * @param bo 任务完成参数 * @return 返回是否成功 */ Boolean complete(AlarmCompleteBo bo); + /** + * 分类统计进入预警数量 + * + * @return 返回预警统计信息 + */ + List queryStatisticsCurrDay(); + + /** + * 分类查询总的预警数量 + * @return 返回预警信息 + */ + List queryStatistics(); + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java index 02f4b36e..2f59f655 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java @@ -30,6 +30,7 @@ import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo; import org.dromara.sis.domain.enums.AlarmStatus; import org.dromara.sis.domain.enums.EventBigTypeEnum; import org.dromara.sis.domain.enums.EventSmallTypeEnum; +import org.dromara.sis.domain.vo.QueryStatisticsAlarmVo; import org.dromara.sis.domain.vo.SisAlarmEventsVo; import org.dromara.sis.mapper.SisAlarmEventsMapper; import org.dromara.sis.service.ISisAlarmEventAttachmentsService; @@ -349,4 +350,15 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService { return true; } + + @Override + public List queryStatisticsCurrDay() { + Date now = new Date(); + return this.baseMapper.queryStatisticsCurrDay(now); + } + + @Override + public List queryStatistics() { + return this.baseMapper.queryStatistics(); + } } diff --git a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml index fe53102b..83318a47 100644 --- a/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml +++ b/ruoyi-modules/Sis/src/main/resources/mapper/sis/SisAlarmEventsMapper.xml @@ -4,4 +4,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + +