From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +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 | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 73e1f3d..aa63ecc 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
@@ -64,6 +64,18 @@
}
/**
+ * 添加
+ *
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-修改状态", notes="告警记录-修改状态")
+ @PostMapping(value = "/updateStatus")
+ public R updateStatus(@RequestBody AlarmRecord alarmRecord) {
+ return R.data(alarmRecordService.updateStatus(alarmRecord));
+ }
+
+ /**
* 编辑
*
* @param alarmRecord
@@ -123,6 +135,17 @@
}
/**
+ * 查询大坝安全告警统计数据
+ * @param alarmRecord
+ * @return
+ */
+ @ApiOperation(value="告警记录-告警统计-查询大坝安全告警统计数据", notes="告警记录-告警统计-查询大坝安全告警统计数据")
+ @GetMapping(value = "/statisticAlarmRecordByAlarmRuleType")
+ public R statisticAlarmRecordByAlarmRuleType(AlarmRecordVO alarmRecord) {
+ return R.data(alarmRecordService.statisticAlarmRecordByAlarmRuleType(alarmRecord));
+ }
+
+ /**
* 按行政区统计告警
* @param alarmRecord
* @return
--
Gitblit v1.9.3