From 61c0c3ccae4c23a90c405d7ac1cb49f7d5ee0479 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 12 九月 2023 09:48:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
index ae518cb..0b7e7a6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
@@ -45,6 +45,13 @@
List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
return AjaxResult.success(result);
}
+ @GetMapping("/AllList")
+ @ApiOperation(value = "瀹炴椂鎶ヨ鑱氬悎鎺ュ彛(all)",notes = "鎸夋姤璀﹀埛鏂版椂闂磋仛鍚堟煡璇�")
+ @ApiOperationSupport(includeParameters = {"command"},order = 1)
+ public AjaxResult selectAlarmLogAll() {
+ List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogsAll();
+ return AjaxResult.success(result);
+ }
@PostMapping("/view")
@ApiOperation(value = "鏌ョ湅鎶ヨ鎺ュ彛",notes = "鎸囧畾鏌ョ湅鏌愪釜鎶ヨ鏁版嵁")
@ApiOperationSupport(includeParameters = {"command","id"},order = 3)
--
Gitblit v1.9.3