From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/controller/AlarmRecordController.java | 66 ++++++++++++++++++++++++++++++++-
1 files changed, 64 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..e603683 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));
}
/**
@@ -61,6 +61,18 @@
@PostMapping(value = "/add")
public R add(@RequestBody AlarmRecord alarmRecord) {
return R.data(alarmRecordService.save(alarmRecord));
+ }
+
+ /**
+ * 添加
+ *
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-修改状态", notes="告警记录-修改状态")
+ @PostMapping(value = "/updateStatus")
+ public R updateStatus(@RequestBody AlarmRecord alarmRecord) {
+ return R.data(alarmRecordService.updateStatus(alarmRecord));
}
/**
@@ -111,4 +123,54 @@
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 = "/statisticAlarmRecordByAlarmRuleType")
+ public R statisticAlarmRecordByAlarmRuleType(AlarmRecordVO alarmRecord) {
+ return R.data(alarmRecordService.statisticAlarmRecordByAlarmRuleType(alarmRecord));
+ }
+
+ @GetMapping(value = "/statisticsPie")
+ public R statisticsPie(AlarmRecordVO alarmRecordVO){
+ return R.data(alarmRecordService.statisticsPie(alarmRecordVO));
+ }
+
+
+ /**
+ * 按行政区统计告警
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-告警统计", notes="告警记录-告警统计")
+ @GetMapping(value = "/statisticAlarmRecord")
+ public R statisticAlarmRecord(AlarmRecordVO alarmRecord) {
+ return R.data(alarmRecordService.statisticAlarmRecord(alarmRecord));
+ }
+
+ /**
+ * 告警统计按告警分类-等级统计
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-告警统计按告警分类-等级统计", notes="告警记录-告警统计按告警分类-等级统计")
+ @GetMapping(value = "/statisticAlaByTypeAndLev")
+ public R statisticAlaByTypeAndLev(AlarmRecordVO alarmRecord) {
+ return R.data(alarmRecordService.statisticAlaByTypeAndLev(alarmRecord));
+ }
+
}
--
Gitblit v1.9.3