From 9254e84b203105f15385848ed3607df178a19023 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 19 Oct 2023 11:23:48 +0800
Subject: [PATCH] 新增大中型水库统计数据维护（数据上报，分页查询）
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
index b4475c0..73e1f3d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java
@@ -47,8 +47,8 @@
*/
@ApiOperation(value="告警记录-自定义分页列表查询", notes="告警记录-自定义分页列表查询")
@GetMapping(value = "/page")
- public R page(AlarmRecordVO alarmRecord, Query query) {
- return R.data( alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
+ public R selectAlarmPage(AlarmRecordVO alarmRecord, Query query) {
+ return R.data(alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
}
/**
@@ -111,4 +111,26 @@
return R.data(alarmRecord);
}
+ /**
+ * 按行政区统计告警-按三大类
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-告警统计-按三大类", notes="告警记录-告警统计-按三大类")
+ @GetMapping(value = "/statisticAlarmRecordByType")
+ public R statisticAlarmRecordByType(AlarmRecordVO alarmRecord) {
+ return R.data(alarmRecordService.statisticAlarmRecordByType(alarmRecord));
+ }
+
+ /**
+ * 按行政区统计告警
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-告警统计", notes="告警记录-告警统计")
+ @GetMapping(value = "/statisticAlarmRecord")
+ public R statisticAlarmRecord(AlarmRecordVO alarmRecord) {
+ return R.data(alarmRecordService.statisticAlarmRecord(alarmRecord));
+ }
+
}
--
Gitblit v1.9.3