From f6289a3070749caf8ca010b83f2a74be1764901f Mon Sep 17 00:00:00 2001
From: zhangjianrock@163.com <zhangjianrock@163.com>
Date: 星期六, 13 一月 2024 15:59:50 +0800
Subject: [PATCH] 无人机配置
---
ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 71e23c3..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
@@ -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)
@@ -62,11 +69,11 @@
@GetMapping("/List")
@ApiOperation(value = "鍘嗗彶鎶ヨ鑱氬悎鎺ュ彛",notes = "閫氳繃command鍜屾椂闂存煡璇㈠巻鍙叉暟鎹�")
@ApiImplicitParams({
- @ApiImplicitParam(name="command",value="鎶ヨ鏍囪瘑",dataType="integer",paramType="query",example="1001",required=true),
- @ApiImplicitParam(name="beginTime",value="寮�濮嬫椂闂�",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true),
- @ApiImplicitParam(name="endTime",value="缁撴潫鏃堕棿",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true),
- @ApiImplicitParam(name="pageNum",value="椤电爜",dataType="integer",paramType="query",example="1",required=true),
- @ApiImplicitParam(name="pageSize",value="椤垫暟閲�",dataType="integer",paramType="query",example="10",required=true)
+ @ApiImplicitParam(name="command",value="鎶ヨ鏍囪瘑",dataType="integer",paramType="query",example="1001",required=true,dataTypeClass = Integer.class),
+ @ApiImplicitParam(name="beginTime",value="寮�濮嬫椂闂�",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true,dataTypeClass = String.class),
+ @ApiImplicitParam(name="endTime",value="缁撴潫鏃堕棿",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true,dataTypeClass = String.class),
+ @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) {
startPage();
@@ -80,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