From 305fe6a8621998e5130d541660c2e3c5f02672d6 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 30 十月 2023 09:27:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 8 ++++++++
1 files changed, 8 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 0b7e7a6..3ef2d72 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
@@ -87,4 +87,12 @@
Map<String, PriorityBlockingQueue<GuideTask>> cameraQueueMap = GuidePriorityQueue.cameraQueueMap;
return AjaxResult.success(cameraQueueMap);
}
+
+ @PostMapping("/ThermalMapList")
+ @ApiOperation(value = "鐑姏鍥炬帴鍙�",notes = "鎸夋姤璀﹀埛鏂版椂闂存寜鎶ヨ绫诲埆鑱氬悎鏌ヨ")
+ @ApiOperationSupport(includeParameters = {"command","refreshTime"},order = 1)
+ public AjaxResult selectThermalMap(@RequestBody GlobalAlarmCondition condition) {
+ List<GlobalAlarmData> result = globalAlarmService.selectThermalMap(condition);
+ return AjaxResult.success(result);
+ }
}
--
Gitblit v1.9.3