From 56b6e1d795e9a4badee9229d8a6ccd6e0d56d4c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 04 七月 2024 10:22:25 +0800
Subject: [PATCH] 电磁锁电子围栏概要提交
---
ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..a81d902 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
@@ -75,9 +75,9 @@
@ApiImplicitParam(name="pageNum",value="椤电爜",dataType="integer",paramType="query",example="1",required=true,dataTypeClass = Integer.class),
@ApiImplicitParam(name="pageSize",value="椤垫暟閲�",dataType="integer",paramType="query",example="10",required=true,dataTypeClass = Integer.class)
})
- public TableDataInfo selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
+ public TableDataInfo selectAlarmList(String name,Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
startPage();
- Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize);
+ Object alarmList = globalAlarmService.selectAlarmList(name,command,beginTime,endTime, pageNum, pageSize);
return getDataTable((List)alarmList);
}
@@ -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